From 4519bb494e7c88890aa0022d4aaabffb0b6d8faf Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Mon, 16 Apr 2018 23:48:54 +0200
Subject: [PATCH] Windows: implement compatibility for Windows 10 major updates
 using ReflectDrivers mechanism whose support started from Windows 10 version
 1607.

---
 src/Common/BaseCom.cpp                    |  24 +++++
 src/Common/BaseCom.h                      |   1 +
 src/Common/BootEncryption.cpp             |  59 ++++++++++
 src/Common/BootEncryption.h               |   2 +-
 src/Common/Dlgcode.c                      | 125 ++++++++++++++++++++++
 src/Common/Dlgcode.h                      |   3 +
 src/Format/FormatCom.cpp                  |   5 +
 src/Format/FormatCom.idl                  |   3 +-
 src/Mount/MainCom.cpp                     |   5 +
 src/Mount/MainCom.idl                     |   3 +-
 src/Release/Setup Files/veracrypt-x64.cat | Bin 0 -> 10590 bytes
 src/Release/Setup Files/veracrypt-x64.sys | Bin 828688 -> 828688 bytes
 src/Release/Setup Files/veracrypt.Inf     |  80 ++++++++++++++
 src/Release/Setup Files/veracrypt.cat     | Bin 0 -> 10558 bytes
 src/Release/Setup Files/veracrypt.sys     | Bin 768528 -> 768528 bytes
 src/Setup/ComSetup.cpp                    |  12 +--
 src/Setup/Setup.c                         |  76 ++-----------
 src/Setup/Setup.h                         |   5 +
 18 files changed, 326 insertions(+), 77 deletions(-)
 create mode 100644 src/Release/Setup Files/veracrypt-x64.cat
 create mode 100644 src/Release/Setup Files/veracrypt.Inf
 create mode 100644 src/Release/Setup Files/veracrypt.cat

diff --git a/src/Common/BaseCom.cpp b/src/Common/BaseCom.cpp
index e8c75a68..738e44cf 100644
--- a/src/Common/BaseCom.cpp
+++ b/src/Common/BaseCom.cpp
@@ -429,5 +429,29 @@ DWORD BaseCom::WriteEfiBootSectorUserConfig (DWORD userConfig, BSTR customUserMe
 		return ERROR_EXCEPTION_IN_SERVICE;
 	}
 
+	return ERROR_SUCCESS;
+}
+
+DWORD BaseCom::UpdateSetupConfigFile (BOOL bForInstall)
+{
+	try
+	{
+		BootEncryption bootEnc (NULL);
+		bootEnc.UpdateSetupConfigFile (bForInstall? true : false);
+	}
+	catch (SystemException &)
+	{
+		return GetLastError();
+	}
+	catch (Exception &e)
+	{
+		e.Show (NULL);
+		return ERROR_EXCEPTION_IN_SERVICE;
+	}
+	catch (...)
+	{
+		return ERROR_EXCEPTION_IN_SERVICE;
+	}
+
 	return ERROR_SUCCESS;
 }
\ No newline at end of file
diff --git a/src/Common/BaseCom.h b/src/Common/BaseCom.h
index e91f75af..eb89dd8e 100644
--- a/src/Common/BaseCom.h
+++ b/src/Common/BaseCom.h
@@ -117,6 +117,7 @@ public:
 	static DWORD RestoreEfiSystemLoader ();
 	static DWORD GetEfiBootDeviceNumber (BSTR* pSdn);
 	static DWORD WriteEfiBootSectorUserConfig (DWORD userConfig, BSTR customUserMessage, int pim, int hashAlg);
+	static DWORD UpdateSetupConfigFile (BOOL bForInstall);
 };
 
 
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp
index 55eafb75..b57f5c28 100644
--- a/src/Common/BootEncryption.cpp
+++ b/src/Common/BootEncryption.cpp
@@ -396,6 +396,18 @@ namespace VeraCrypt
 			}
 		}
 
+		static void UpdateSetupConfigFile (bool bForInstall)
+		{
+			Elevate();
+
+			DWORD result = ElevatedComInstance->UpdateSetupConfigFile (bForInstall ? TRUE : FALSE);
+			if (result != ERROR_SUCCESS)
+			{
+				SetLastError (result);
+				throw SystemException(SRC_POS);
+			}
+		}
+
 		static void Release ()
 		{
 			if (--ReferenceCount == 0 && ElevatedComInstance)
@@ -470,6 +482,7 @@ namespace VeraCrypt
 		static void RestoreEfiSystemLoader () { throw ParameterIncorrect (SRC_POS); }
 		static void GetEfiBootDeviceNumber (PSTORAGE_DEVICE_NUMBER pSdn) { throw ParameterIncorrect (SRC_POS); }
 		static void WriteEfiBootSectorUserConfig (byte userConfig, const string &customUserMessage, int pim, int hashAlg) { throw ParameterIncorrect (SRC_POS); }
+		static void UpdateSetupConfigFile (bool bForInstall) { throw ParameterIncorrect (SRC_POS); }
 	};
 
 #endif // SETUP
@@ -2685,6 +2698,27 @@ namespace VeraCrypt
 		return conf.Save (path.c_str(), hwndDlg);
 	}
 
+	void BootEncryption::UpdateSetupConfigFile (bool bForInstall)
+	{
+		// starting from Windows 10 1607 (Build 14393), ReflectDrivers in Setupconfig.ini is supported
+		if (IsOSVersionAtLeast (WIN_10, 0) && CurrentOSBuildNumber >= 14393)
+		{
+			wchar_t szInstallPath [TC_MAX_PATH];
+			wchar_t szSetupconfigLocation [TC_MAX_PATH + 20];
+
+			if (bForInstall)
+				GetInstallationPath (NULL, szInstallPath, ARRAYSIZE (szInstallPath), NULL);
+			if (GetSetupconfigLocation (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation)))
+			{
+				::CreateDirectoryW (szSetupconfigLocation, NULL);
+
+				StringCchCatW (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation), L"SetupConfig.ini");
+
+				WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", bForInstall? szInstallPath : NULL, szSetupconfigLocation);
+			}
+		}
+	}
+
 	void BootEncryption::InstallBootLoader (bool preserveUserConfig, bool hiddenOSCreation, int pim, int hashAlg)
 	{
 		Device device (GetSystemDriveConfiguration().DevicePath);
@@ -2851,6 +2885,15 @@ namespace VeraCrypt
 			device.SeekAt (TC_SECTOR_SIZE_BIOS);
 			device.Write (bootLoaderBuf + TC_SECTOR_SIZE_BIOS, sizeof (bootLoaderBuf) - TC_SECTOR_SIZE_BIOS);
 		}
+
+		if (!IsAdmin() && IsUacSupported())
+		{
+			Elevator::UpdateSetupConfigFile (true);
+		}
+		else
+		{
+			UpdateSetupConfigFile (true);
+		}
 	}
 
 #ifndef SETUP
@@ -3786,6 +3829,22 @@ namespace VeraCrypt
 			device.SeekAt (0);
 			device.Write (bootLoaderBuf, sizeof (bootLoaderBuf));
 		}
+
+		// starting from Windows 10 1607 (Build 14393), ReflectDrivers in Setupconfig.ini is supported
+		if (IsOSVersionAtLeast (WIN_10, 0) && CurrentOSBuildNumber >= 14393)
+		{
+			wchar_t szSetupconfigLocation [TC_MAX_PATH + 20];
+
+			if (GetSetupconfigLocation (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation)))
+			{
+				StringCchCatW (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation), L"SetupConfig.ini");
+
+				if (FileExists (szSetupconfigLocation))
+				{
+					WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", NULL, szSetupconfigLocation);
+				}
+			}
+		}
 	}
 
 #endif // SETUP
diff --git a/src/Common/BootEncryption.h b/src/Common/BootEncryption.h
index f63ec541..6eb42b50 100644
--- a/src/Common/BootEncryption.h
+++ b/src/Common/BootEncryption.h
@@ -310,7 +310,7 @@ namespace VeraCrypt
 		void GetEfiBootDeviceNumber (PSTORAGE_DEVICE_NUMBER pSdn);
 		void BackupSystemLoader ();
 		void RestoreSystemLoader ();
-
+		void UpdateSetupConfigFile (bool bForInstall);
 	protected:
 		static const uint32 RescueIsoImageSize = 1835008; // Size of ISO9660 image with bootable emulated 1.44MB floppy disk image
 
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 347f1207..03e0d6c8 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -147,6 +147,7 @@ OSVersionEnum nCurrentOS = WIN_UNKNOWN;
 int CurrentOSMajor = 0;
 int CurrentOSMinor = 0;
 int CurrentOSServicePack = 0;
+int CurrentOSBuildNumber = 0;
 BOOL RemoteSession = FALSE;
 BOOL UacElevated = FALSE;
 
@@ -344,6 +345,13 @@ static unsigned char gpbSha1CodeSignCertFingerprint[64] = {
 	0x40, 0xCE, 0x17, 0x6C
 };
 
+typedef HRESULT (WINAPI *SHGETKNOWNFOLDERPATH) (
+  _In_     REFKNOWNFOLDERID rfid,
+  _In_     DWORD            dwFlags,
+  _In_opt_ HANDLE           hToken,
+  _Out_    PWSTR            *ppszPath
+);
+
 /* Windows dialog class */
 #define WINDOWS_DIALOG_CLASS L"#32770"
 
@@ -2663,6 +2671,7 @@ void InitOSVersionInfo ()
 	CurrentOSMajor = os.dwMajorVersion;
 	CurrentOSMinor = os.dwMinorVersion;
 	CurrentOSServicePack = os.wServicePackMajor;
+	CurrentOSBuildNumber = os.dwBuildNumber;
 
 	if (os.dwPlatformId == VER_PLATFORM_WIN32_NT && CurrentOSMajor == 5 && CurrentOSMinor == 0)
 		nCurrentOS = WIN_2000;
@@ -13520,3 +13529,119 @@ BOOL VerifyModuleSignature (const wchar_t* path)
 
 	return bResult;
 }
+
+void GetInstallationPath (HWND hwndDlg, wchar_t* szInstallPath, DWORD cchSize, BOOL* pbInstallPathDetermined)
+{
+	HKEY hkey;
+	BOOL bInstallPathDetermined = FALSE;
+	wchar_t path[MAX_PATH+20];
+	ITEMIDLIST *itemList;
+
+	memset (szInstallPath, 0, cchSize * sizeof (wchar_t));
+
+	// Determine if VeraCrypt is already installed and try to determine its "Program Files" location
+	if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\VeraCrypt", 0, KEY_READ | KEY_WOW64_32KEY, &hkey) == ERROR_SUCCESS)
+	{
+		/* Default 'UninstallString' registry strings written by VeraCrypt:
+		------------------------------------------------------------------------------------
+		5.0+	"C:\Program Files\VeraCrypt\VeraCrypt Setup.exe" /u
+		*/
+
+		wchar_t rv[MAX_PATH*4];
+		DWORD size = sizeof (rv);
+		if (RegQueryValueEx (hkey, L"UninstallString", 0, 0, (LPBYTE) &rv, &size) == ERROR_SUCCESS && wcsrchr (rv, L'/'))
+		{
+			size_t len = 0;
+
+			// Cut and paste the location (path) where VeraCrypt is installed to InstallationPath
+			if (rv[0] == L'"')
+			{
+				len = wcsrchr (rv, L'/') - rv - 2;
+				StringCchCopyNW (szInstallPath, cchSize, rv + 1, len);
+				szInstallPath [len] = 0;
+				bInstallPathDetermined = TRUE;
+
+				if (szInstallPath [wcslen (szInstallPath) - 1] != L'\\')
+				{
+					len = wcsrchr (szInstallPath, L'\\') - szInstallPath;
+					szInstallPath [len] = 0;
+				}
+			}
+
+		}
+		RegCloseKey (hkey);
+	}
+
+	if (!bInstallPathDetermined)
+	{
+		/* VeraCrypt is not installed or it wasn't possible to determine where it is installed. */
+
+		// Default "Program Files" path.
+		SHGetSpecialFolderLocation (hwndDlg, CSIDL_PROGRAM_FILES, &itemList);
+		SHGetPathFromIDList (itemList, path);
+
+		if (Is64BitOs())
+		{
+			// Use a unified default installation path (registry redirection of %ProgramFiles% does not work if the installation path is user-selectable)
+			wstring s = path;
+			size_t p = s.find (L" (x86)");
+			if (p != wstring::npos)
+			{
+				s = s.substr (0, p);
+				if (_waccess (s.c_str(), 0) != -1)
+					StringCbCopyW (path, sizeof (path), s.c_str());
+			}
+		}
+
+		StringCbCatW (path, sizeof(path), L"\\VeraCrypt\\");
+		StringCbCopyW (szInstallPath, cchSize, path);
+	}
+
+	// Make sure the path ends with a backslash
+	if (szInstallPath [wcslen (szInstallPath) - 1] != L'\\')
+	{
+		StringCbCatW (szInstallPath, cchSize, L"\\");
+	}
+
+	if (pbInstallPathDetermined)
+		*pbInstallPathDetermined = bInstallPathDetermined;
+}
+
+BOOL GetSetupconfigLocation (wchar_t* path, DWORD cchSize)
+{
+	wchar_t szShell32Path[MAX_PATH] = {0};
+	HMODULE hShell32 = NULL;
+	BOOL bResult = FALSE;
+
+	path[0] = 0;
+
+	if (GetSystemDirectory(szShell32Path, MAX_PATH))
+		StringCchCatW (szShell32Path, MAX_PATH, L"\\Shell32.dll");
+	else
+		StringCchCopyW (szShell32Path, MAX_PATH, L"C:\\Windows\\System32\\Shell32.dll");
+
+	hShell32 = LoadLibrary (szShell32Path);
+	if (hShell32)
+	{
+		SHGETKNOWNFOLDERPATH SHGetKnownFolderPathFn = (SHGETKNOWNFOLDERPATH) GetProcAddress (hShell32, "SHGetKnownFolderPath");
+		if (SHGetKnownFolderPathFn)
+		{
+			wchar_t* pszUsersPath = NULL;
+			if (S_OK == SHGetKnownFolderPathFn (FOLDERID_UserProfiles, 0, NULL, &pszUsersPath))
+			{
+				StringCchPrintfW (path, cchSize, L"%s\\Default\\AppData\\Local\\Microsoft\\Windows\\WSUS\\", pszUsersPath);
+				CoTaskMemFree (pszUsersPath);
+				bResult = TRUE;
+			}
+		}
+		FreeLibrary (hShell32);
+	}
+
+	if (!bResult && CurrentOSMajor >= 10)
+	{
+		StringCchPrintfW (path, cchSize, L"%c:\\Users\\Default\\AppData\\Local\\Microsoft\\Windows\\WSUS\\", szShell32Path[0]);					
+		bResult = TRUE;
+	}
+
+	return bResult;
+}
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h
index 5d10db35..ea2828fd 100644
--- a/src/Common/Dlgcode.h
+++ b/src/Common/Dlgcode.h
@@ -135,6 +135,7 @@ extern OSVersionEnum nCurrentOS;
 extern int CurrentOSMajor;
 extern int CurrentOSMinor;
 extern int CurrentOSServicePack;
+extern int CurrentOSBuildNumber;
 extern BOOL RemoteSession;
 extern HANDLE hDriver;
 extern HINSTANCE hInst;
@@ -529,6 +530,8 @@ BOOL RaisePrivileges(void);
 BOOL DeleteDirectory (const wchar_t* szDirName);
 INT_PTR SecureDesktopDialogBoxParam (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);
 BOOL VerifyModuleSignature (const wchar_t* path);
+void GetInstallationPath (HWND hwndDlg, wchar_t* szInstallPath, DWORD cchSize, BOOL* pbInstallPathDetermined);
+BOOL GetSetupconfigLocation (wchar_t* path, DWORD cchSize);
 #ifdef __cplusplus
 }
 
diff --git a/src/Format/FormatCom.cpp b/src/Format/FormatCom.cpp
index 1bfb4be9..5df23f19 100644
--- a/src/Format/FormatCom.cpp
+++ b/src/Format/FormatCom.cpp
@@ -172,6 +172,11 @@ public:
 		return BaseCom::WriteEfiBootSectorUserConfig (userConfig, customUserMessage,pim, hashAlg);
 	}
 
+	virtual DWORD STDMETHODCALLTYPE UpdateSetupConfigFile (BOOL bForInstall)
+	{
+		return BaseCom::UpdateSetupConfigFile (bForInstall);
+	}
+
 protected:
 	DWORD MessageThreadId;
 	LONG RefCount;
diff --git a/src/Format/FormatCom.idl b/src/Format/FormatCom.idl
index 855d024b..970fe568 100644
--- a/src/Format/FormatCom.idl
+++ b/src/Format/FormatCom.idl
@@ -16,7 +16,7 @@ import "..\Common\Password.h";
 [
 	uuid(56327DDA-F1A7-4e13-B128-520D129BDEF6),
 	helpstring("VeraCrypt Format UAC Support Library"),
-	version(2.7)	// Update ComSetup.cpp when changing version number
+	version(2.8)	// Update ComSetup.cpp when changing version number
 ]
 library TrueCryptFormatCom
 {
@@ -47,6 +47,7 @@ library TrueCryptFormatCom
 		DWORD RestoreEfiSystemLoader ();
 		DWORD GetEfiBootDeviceNumber (BSTR* pSdn);
 		DWORD WriteEfiBootSectorUserConfig (DWORD userConfig, BSTR customUserMessage, int pim, int hashAlg);
+		DWORD UpdateSetupConfigFile (BOOL bForInstall);
 	};
 
 	[
diff --git a/src/Mount/MainCom.cpp b/src/Mount/MainCom.cpp
index eb1f5921..f3ce90b2 100644
--- a/src/Mount/MainCom.cpp
+++ b/src/Mount/MainCom.cpp
@@ -193,6 +193,11 @@ public:
 		return BaseCom::WriteEfiBootSectorUserConfig (userConfig, customUserMessage,pim, hashAlg);
 	}
 
+	virtual DWORD STDMETHODCALLTYPE UpdateSetupConfigFile (BOOL bForInstall)
+	{
+		return BaseCom::UpdateSetupConfigFile (bForInstall);
+	}
+
 protected:
 	DWORD MessageThreadId;
 	LONG RefCount;
diff --git a/src/Mount/MainCom.idl b/src/Mount/MainCom.idl
index a1ab3cd7..25bb80ce 100644
--- a/src/Mount/MainCom.idl
+++ b/src/Mount/MainCom.idl
@@ -16,7 +16,7 @@ import "..\Common\Password.h";
 [
 	uuid(9ACF6176-5FC4-4690-A025-B3306A50EB6A),
 	helpstring("VeraCrypt Main UAC Support Library"),
-	version(2.9)	// Update ComSetup.cpp when changing version number
+	version(2.10)	// Update ComSetup.cpp when changing version number
 ]
 library TrueCryptMainCom
 {
@@ -51,6 +51,7 @@ library TrueCryptMainCom
 		DWORD RestoreEfiSystemLoader ();
 		DWORD GetEfiBootDeviceNumber (BSTR* pSdn);
 		DWORD WriteEfiBootSectorUserConfig (DWORD userConfig, BSTR customUserMessage, int pim, int hashAlg);
+		DWORD UpdateSetupConfigFile (BOOL bForInstall);
 	};
 
 	[
diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat
new file mode 100644
index 0000000000000000000000000000000000000000..37a162c271335c2859575879dd4f1ff99d595920
GIT binary patch
literal 10590
zcmeHtc|4Te`~N+Q!Pv>3v6OwgXBcB?6A=+5gv8j#HkPp@VJ1oHp-9=P5ke`cELoC5
zi>1<nkR?)2sfaeo?~LeCPtWK1<NJGlpXd8}{a*88?sLw49p_x<x~}(iy$_h7?1<r1
zNm!rofd|2kWHOXDzzk(mBm#lwgLyEVt_kZAo+vaD!3Mz$wp0wKDh7c@Fi2Pglfkwd
zbj8Bl80>r}Hv)m?cYC1d`0{h&`U4~dqR5ft0Z|^jF075$hVgg;QP&aXUGzGNH7m*$
zW+1rHGEm;JbHS&{-X=58Cgg)SMpB)7+irOqmYjY*C~ycRvkOljh57#wMxyY@I0)8W
z)Puk)z{_#mkQHPD8A3Gh2|=Ry5fB2+OMvttJOo1;;0J=>RX<3<um+9;GJz<NKjb+t
zu{0d=ghC)P<PLuCfP%ne8c-;B3T4SVf0suh(0D7@5*Az3!v|wgNH!)DeUi08{7-uP
z`<=q{T=bGPfdy}}H=Q_ee&4CEQ<8RHl7;O3@$|%>RlxXvtO5!Y2zjwoz(AnUGW))U
z<xD2-n5l_zSh~jFoLlDl>In{EQ>S~+xGOELB-Z2U{r{Q;+b%jGG~N_mw`gTZg!o^a
z)!*%K?yO!Ob9h@_@#%KLFu!%m&d2%>Gau>v;;eu%{8!AC$v||0^LhZ&4}aGIH!xiK
z9+=L+NdRvNgWRA1VE>`uLxHH^jAbA*$avltwrc^e(S`IN0{D=?vkUMgZSYNiwB|p$
z;G5-NI$)gjrq0|uc!&tzVac(cU?8J2Hv@5An)NO)r60Tz&GJTmXf0S%AmqXF$VDqz
zVmI%VM&G>>$m{&DD<xO~CkWXBX$thsi9>-K`_JzMy9G#wfmwi@{tt3$unJBDG6qBL
z;IESBoS*h>j$g>q6Mhhmgu`)YR^XX`)yD<=ZI(h<%GwIHtqrMxr=R;=pv^%0`2R3Q
z_zz=RU=vIRPZi9-fEbEi&qN^+NTd*}TRH=}C4fw)TmjFZ#R@_5K_0;cf-XH7&joX0
zP_}4{5YpBLF9Zv)8XQ7cdvd4`CD5Bj4aD<<SPeSah1fTHdIV4dJ@7bqDXRx7By34>
z521!qy=XE<)Q})*2$@C!61w0hz&J`s^N(?RN}vZdB2;FJ4<*Dy#+n>L+W}+(f~bL>
zfk4_&h5!R_zyX*b;bEAFCuwWrbsSl!v8V~t5B(zxHh}fMEtv4<1+OQEctnsxJm*#m
z_UA_Nr+~Fvhq?JvLVY|#fJezK)+>NW6a&G>ii}t!1A&0rYEGl-kHBAILvlnL$9_AM
znOl*+nX%JD?M}+moxWVCg1w0?0}XFK4`OF)f^u+rts*?|h}59*t2L>`3Vu}&y<;BF
zY=N$~6A7490=wnC2KtMqwU$p^o}Jp?Lg0z6UbRbUhI`n|$L@uacK7>h{!1O`d8=|7
zl$8g%;yA8pQCp8Ld*nK(cGg~#tSx1CR)Qns2z%uQ`@>>xDH-n+QQKP|aHZ#a?7^RY
z(&=@gOX1byv8uIqN+V8R8d8brmNU=v-0#oze#7d!`n<bpttvA1KlRTz#ndY(dZMsz
zfav_dl$U}<=ny^K&i6gwayWKmt?tXpOM9zF>=aaW5$*2;&LU9&dh-~F^FSjduo_Ub
zlssA<UiRH_uqZYR*Fr*pVnbj!K!c5q9fg9WSa0*9MbJy~PFF?BmKUx_{kS5zrRDq+
zWBHi1AdG@x0kk@-ny(Bi;(1^$)-iGkp)IYfH{(U%C9Ec!5D!6%fY&Ce60`{<5($=O
zNi9Q*!6I=>ZtCY0nqOZwAs=)3@fl?sUZCh)n8tcR8XW-p!4#%9(=)-{heiw1*VK%N
zh|maFFnJAkYJg^tAB7qes_7o$|A(#16X1Dk2TybM4!-9s9(;eddDgQb_{Fk&4ImHG
z=?fbN`BNAi3I{K=VPt~m->$$jgckZgTmuaxabV{{2*fNJ31Zfd(E`OlA|Pkvv5u>^
z`7*<7U+pup)Y_NbojVpR^&w2x%d}vJ47W_bg5#4S_g1&gk>&E<QFY>6?}DQQ+m`Jh
zw^f>^rC~ojT46t2<<m2eoq}>TchpdgeQcG=Uy_>^mJ<IPakbCXA>F;rLkUHD#CuY=
zuEC{cscylYyc}eL{hWE?M2BBNWdr9uj-(apYxn9LnpJCAFSk!-)4{viInqwHCtTu(
z>hrfFHVa6pZE5X%B&%j!{)CF{+a2L|gA1R<9~V9|d~~G}jt|MF)t9o%-da$k+3eVw
zzNF@LUIiXs2hU91_u6HUed`vwzdD*bUzLa9T^5)!WIw)i-Nf`zcMbD>;ypF1X*&a-
zFSz~BmES{*9J84ctFV}p8zU?s-gme29LDoDPFY0cU2TxQUJ!qLh9esmvYWL?ED|^~
zbN2U!B#-yFlbwf58V>NR#`xB9@fANu73ICiI>I&3cnKS&Q`nKn_c2TKL(d^GY41KE
z^U*MgtF`^;XayzhulilLm4-f8=y$#gsu+)--U>-e3O1aUH57e!!A3+~MY(`8z)OZ;
z;okIAWyJ?w6AxzA(cfxb4pcm~lsGM!e%y_VmlTGQTeq@JRGw6KFgQ9Vo#U*uK`Nb7
z*sWPb1x8mLBfgHV_+4D_qUPtuy5Dolk2K}#4D=aiOy9qLYCL-5kXO=qf^t4n2xhQb
zgLGea5ytRPc$_2C?uPfzVGPetRs+)$|B;YQfMJ$%qlA?I2-%ydQ~)Kw5hz|1cQVaW
z#xRWLLk(etYv5(@9J*-ZVLXulYvBnbfGz~RZ%u7h^WO)D4CJ4o1<8UIB!Cv+jV&&?
zGn*#w?;@*rh-cNw&m7$r*4Dc0e5UQh<v5g%FEy^2yS#dZ;yN@&*zYXwlNi%;x~NdU
zl}bW9%hfdX#MT#@Z09I$v~j(40M2XP<t}S7z>%g|m41|}JiDVS`KaDatvq`i9J1tf
zWmN2}Ll5z8*o#{iLXO!rv{b59-pIyj`W+iE)0dpoyI)ttRY=Kn5?Z>^o0D{oS)}0U
zSRH$|#_aY!jJI6V^HfRk6lAcpQv+=|rsR2)QnAnO{I#{3%VX%{v5FokLEb*sL#8R6
zBX4=t<g|t*Z%B5^TWWp@pT<W|WSmHr_RVxXQ$J4NyFH_|{+PqIt!IZ;Dn}~8w420@
z6K{@)Irg{~T^XIpD*1GE<<ngo&F^q|_RHo656j8zp0IJ<oV<yyPh|f7;!8u=z@BRu
zBegW%`;~5`n-z(nt9u0U%|6vU?O&bV{pms4^Puh$Ck}2ie5gyajaoKm*m`3vv&;xs
zPJsS^-_A~BdGCS7>`TIV<fN{~HzRGv(`RYVQ6~c^SJMi^>qWYEY`Rdye-P2TS7+6x
zGr`^WHl`;(>vDQmObpt~X>h>y?ZZ%F@RF~7ymrDD{j}?8Y_FLH0UrbLf<va08%8V5
zcwTz8<SvWP-{~|yG~+>OzbGx~bi(Itm|P^aNU!DX*Wpv%m$^)WzedG`39Ygpw6i|8
z0IkIUS_?oOvrv``BhVlRgciZ)FLBO;742ov&ae}V!Jxq-1aHD{&m*zL?p+83YzVJj
zKp`YTMC<QR$e8LLs=3)Sh#E?vQA2iU_|O7i@$bu8f<$xUu=90>5o9<A*HV0F)?yQ2
zzVFz>2BQE3{eaUC-`lmMJU_Y3&F9|A!v~!@+q1+PVLO(DG@4a+Z(y1+O%vA5uMfcK
zpK*E)q=Q1J9%1g^kP?Io5G+89aA8FUby!E8pf!iYjtg4`K)eyQfXx@$0Ek!pClzSA
zFQD*W%uV|#I?iG0k@D*X_=%l<xzY}OG&Pb(SuHc|(>pEG7oVIbr1nkPAAh=<KhMEh
zjLl$)vSCFbuM_=bYhC=>hQ=%R;;%K<aUU?PtxHUpcH}s6PEE7FKFupnRpxel5@ns@
z>d<9`G~Z<}W@oy^#@c7={0u{Xv(Nc>DZng)?O7hN_-#yJ!d1T_4sZF=tC<IS3Ne;z
z(!}-`J3Px=a#>K6Zd_u2{ao_7!#i6HlKY}A1v^!%UcYg7&$109!H5EL%~**__shl(
zW2tcKa5QJCpn&w|DID@perM-MN}TDeSa$5a987TUyKwP{gAY~sYW)Qpo494Xrg$~2
z)4Fa?$Bx*Iads8jl-*FFME1UQ8QmaLQR-ekShg*0V@_1Dl;sB{lSo-ix+S5{b?tD4
zMB{{s&J$uNvY~v$<+7^7x~Np6&c+w+eL5-OH<WG{8B0DVNO-l4tlwsibyYP<#kd~H
z=<U|(l#Pf@3@9-Td3@3&@QjC#YRATmX<}>atJOjQ0wX;UV-441q<zhoe7saB+Z>$W
z9n{t(p64vh%+88#a<&Xfrm@EsT0&p?e3lDFsMv-nwiT;MB}a?Drl_5u$!jq<dURW(
zZ&>;3`&}amM238|b?|W2TBXt7s6MLJIgMq=Q>!|;;|m5GX@M%~gyYPwZI{GS?i-vX
zTqw(`3Scvup5@`gGlctKhHy7v+hF>se;o?_WhJ?Y6lBut0rj;|TXLfCT;H7@ivZQ)
z0yT(4aN&6uQH4l^Fs%8992zf&mU+mNlhnOTu{-PVzG8_xMZ>ul$l*ec%DqyD9^mxK
z-xR}J7EQ;EH-U|rAdzRW1E7jF168)n9PhUovdC45Q)0Pm=r2=u&p`FCP|b+>x^%H)
zf)WnRKtQeMUT&K_<wWAHf4Cv{Rax_;oD)aK`yPjXQTV8e)Ts`9COB>R;_ll6iuq;n
z+HAZSs&KE}70)q_g3D{TdBmHmcZcl^s0iv2^<A%Nm*=-E$Y&qcDsXerP|J9QmJE!o
zKQ~Y*Cc5ck^8`gixn)(sdpC<W#l05<%UbT;+C7R*O^QDiT-AR@7Rr?6h|Wz-RhQLm
z-?_VZ^X!<5h<MMQ{p9_Qc|%vfoFMt;*Il7|@s}Y!yQ_`t7kw(PX6x#{l6y9_gM1^|
zEF9_Xc<;<@_fhQ|Q7gk@H75u2NS==vyjE;VSgzkBh_ixh%S{M9)LH(E2_s^I><2l8
zyl#-*m0qmQWeBZ<8A68N)r~?S@C+e5=u`iGW-PK;2nV_(kO<T-$YO*6hHIX3;N(Z3
z0SBc5bgRIsnt{E~PaW@oMInB{km~hw6TGRmuf0ch^X}DkD&l((NX%5rlDQ=38MXIr
ziV70rc;QrX(@QZy5WyGdWi7mx28rkhvxE8Lkcdepy(*tx4%09EBY7w{jAiAaTtX;A
zD<ixjEdQ;A3pAnx0d_#f*k+x~I-8C9c)~i8x)!XXt*!$Ya6GI2ol9Sr{*k_Jp#*rU
z+tA1XK{7U;A>kBvPbP!+Hehvv0juNiE#t<LIq52Mi8gYv#m<pA|E@$EhDk8ksFn_q
z$V#+{-<sO2CLH~b90g$gzv)!!mpZlnMl!)H(_5^&KM^*?QarU00!jKZuf7N!o%$S0
zIqXN<!vC-U3o-Ugk45`zP;+UzK0>}0Ub)Ik)#<IUjUpN^Z73;`F4fK{lpIZl9m-&1
zzH!&Y_$@}<ot9O)92eL2rIkDih3yp>dFy!Y{yt?&Z>wMKO4#aZGO^V(fe??Qk-ZPO
z(6^M`NwY|8XguY7k1Q0Z)GYBSA+DyM{Kcd}QEIujV2FflQt1Ydeb#Pe&NC6xE8p6O
zmDDAzwOq659$yY-m3Qov*HzRJ<Cr&hH_QZ%WZf<+nut=t;@>{rh&fb|$U%G_x%B*t
z%(fMyn#R?Ilf52w`G^J?&a}w3FSS>189Q$m$w9DL$yqLBmCt~thW=w#`OsZ|TN3`@
zJENV^CX!8BK8||=Z2y10w<wpS!E`3DNhui?r9w}K>8UV1<vTQLpaAIuuUyD3L4u9{
z%k0v6gPEoWE4wzbw$b$P^dg7()8^9aHQ&XNur`h$BL!Ii?%JEhbpxi^8nF2OfW3AH
zS5__n7iplM2F3%xPax|uOGaw3FMv2Qmy)tSOWedW)I5-}njVZ=c`PqimU{8!sn#j{
zl{;)h#a}<$2Z+NLuQhqy^6j4*eH&SKqv*K&(@(Wyep~E0R5vk<1*b3D9B7?%6-)|m
zU9-k8yLX%D?6yzaMTr^9?KaTftmVI1S|8gSJ3-pzxO(YC<__~io1s!&KG7-79dys`
z;&Q*?8}09JM?usLu<>%a6?eu^1xHdGlxr(y(1SrI2<D12wxyb1D@KyFYTR71dhFM{
z7;n$?I(T5#*DbcM$(-wu!jRr8ar0pJV>@L7uIJ>PT=6+}*Ad@?k*5MW26H}1ebMbY
zJlR};J(7@LcU<BedhPD2^0;g{U72$E5sz0NChKF|9pw3<H1zDlPX?dHB=PMNsU{Z+
zv}AShnr6i{-EAwp`)1efw}S@3oc+$U3^@++<MY-yYTfuC)IW-6&rj3;;AtB9{A1Dj
zGasIW#E|`{5ykYDLe3Jsnpe#&U5ra1ZBmm}dl0y|X~}&mTl6kCJ-*3fn;Eq?)PUnz
zhWhWn4QOcyDo<V2+@dJ^;bzIk$4XUY#XUzZ6s|pa>yEgg<v_wGm8?7gFZg~9jj*BL
zedknWlBVPh*;0q{bG^nZj#>wI=5{pMKBYXdZ@BjazB<$T%yOEi-r4HKF`T%rX6>D=
zY#MKPnAXI{Z#Wf~KD-!1#Bo$V*6F$LlJbO>XeI~%ryE?!HY}ofN|I!2qdKxfCg;$n
z<R`27FNbv2y@3v_2b1t5q7G4e?%rTg^M57y|1D1CHcqZ6NDjs4iW+V^6Twkge9!1~
zO@A-#Q#H}fH=eVrxMq6G2eIzvf{RAaKPw<wR}!aUxP~n<RPHCF%d>5JQe(iQ>Gmq6
z`v9$!v|lvak5p)WUi)mw&3#k!*4&4yi{6#76@4gVuQu#1O2L~P8*@_~@Xg+#Ry{f;
zUZD^h-yv0?q;>w;HT4}CXA+<CNqg<g>Jr=TPaoHHrQ!4o3twvcZrffLR&drf)!ws1
zL7&NwHAI&w9`qh~@_K)I-Y7K8lhcgkEqs)1u~O?+eBHT|O|^rGqvj{xUwG<R7?pe=
zS8ThlN&EYfGg%jkzLdrk4xb-wV>{_x{(0?q2Wt80(FL561ey|E#C3F;1{Lig?iV7L
z?mhT?o#^s`j6$9t$%J3Q*8h-90LdFj-9U~pPbQGmVf_CsGT|@g{+X^9Vj+z@nw60*
z+@Ns$<fh<e3IVNu^?bYHbxE-t=S%J3fh2BeXZNK%&iTtagfF$<UBfw&?NTznV=QQl
zu-%zEOm_0!1L1v$DNnz$tB(#i-mTg*WBU2*B$eMRAtP$0fh<`X?Iw8H(_)j3{ikED
zOX3^4riZBfYNC7GW3Hv(goNM3v5#9HRUfYVd`n3ugRI?Yf!GS2cDu`tvTP7^KB^Xf
zqJ7-Nf9mrj2HT#Uv9oxX$dTs7-DF&3W?lJ#%^)K9^m%N3aNyUSLc<gY^QKfzVW27I
ztd4I^5JOZ6IZ$7FT{eFW!q48m<Lz-jbsm$Og*QyU#;0fRw8~jFQX=)0i>kS5=dG|B
zv;AL^tBm_TUl{$I%Rtcpg}QC7-X6;R-&-D>l*a<ffD^-}%8Nou0O%Hm^n&E~FS)s+
z&xPCh#r~X&hciDctz^<0VEUDOdJRmk`bQG)zpH^ZZn2rGfe1P}M0IT=EfaMkqVYPs
zDy;l1UzhtaUzf3=hK0C$%2<*^X`q5K@~67{Ew*DeHVDZEJ=w{;1Ivl=%~yWlhEGcy
zCOLlZ(4OyrY2PpSL79n0;K2nyjGdo=MUsL#5keyMCg&f-_k0_Tp0Hw#F8osgOBRU-
z|5Wguy_hRnnOK;EC65w$>YBUo%$_Ur(|YIp&eFT))M(8EZw~v<+lsM5b#^bAS8p_w
zdF={r+Qv1aV5aJfJ$->0Y~JoT9miXqyv+TaW9h8hh)F4bWmlj^%1hngRlC|Qmj>V)
zhVa`&nMWlzI;>oFE0ma4f9`ee1p?uPb`RlWlCmAA^;VHy#S>y%n!U?U7=9$u(ho%J
zu4*@|d!MfyA)M9Q#w?F$`pUVZ<AjyP)1-@qcLvUJMkbm^wGLdUKjIyUEPu@1R{x?E
zKKsR)vkdLCvRdK--;%>h6`rry2OcS2>|*3dYdC5MzTUoEw)prb4lk+ViA?@;p6R`z
zX_Q>G{?N=_0*ncMT;+*~<J#wTcc;iYC3GQHkH_H|$SL4=<8ywO_TSAIzL8qL$Y~an
zS_}jMmiW$e09K3V2QK4J%$4?Vfx732{CmGHq`>p@NA1SQ9Ix)OM>ZC2!KB;0T>22E
z4=tJi$&IIX!1OyXy%naHp_ly1bzyo2OpnWt`8O&HT*^1$Ur+1S2<IPiob6dIw{OXB
zE7_bDTRtc!SVWriLAl3o_+?K*OR99*n|sUBdf#DiRIyI-dsO$*6z;Grt@HJ3nr%`~
zMK-LOI#|q0m?#cc4Z3pkimR3_)@Z<s42|_PG@;!wa7EqH?xHxW4IM2XFIFDx(Eb{C
z-Qlr`0fHS*SHE4y5y7T9E~dVF!~U5MxRrehZ()-{T#?G=`)gCr_^Q8LfAn~@t(es7
z6<;g9L_e{*RW4!>V!b`DVof{8t_ple!10QWR<)$xyWM3g72rcJ`JIWmE~H}lh?Kkl
zK@lTClFNY^MqNBL{Z74E0x`44@y(seE{+L{I^5u(f5mV?xoSn?OS|-Nr<)cbOhthg
PZyHP4+BW8BOSJzVZF$db

literal 0
HcmV?d00001

diff --git a/src/Release/Setup Files/veracrypt-x64.sys b/src/Release/Setup Files/veracrypt-x64.sys
index 6c5227e76ae984789f50d05b24e0d42cd48ef576..f998a592ef5e14b929a3adebcb0e3a6ff64a8521 100644
GIT binary patch
delta 3741
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

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

diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf
new file mode 100644
index 00000000..57f7f0af
--- /dev/null
+++ b/src/Release/Setup Files/veracrypt.Inf	
@@ -0,0 +1,80 @@
+;;;
+;;; VeraCrypt
+;;;
+;;;
+;;; Copyright (c) 2018, IDRIX
+;;;
+
+[Version]
+signature   = "$Windows NT$"
+Class       = "Encryption"                              ;This is determined by the work this filter driver does
+ClassGuid   = {a0a701c0-a511-42ff-aa6c-06dc0395576f}    ;This value is determined by the Class
+Provider    = %ProviderString%
+DriverVer   = 04/14/2018,1.23.0.0
+CatalogFile = veracrypt.cat
+
+
+[DestinationDirs]
+DefaultDestDir          = 12
+MiniFilter.DriverFiles  = 12            ;%windir%\system32\drivers
+
+;;
+;; Default install sections
+;;
+
+[DefaultInstall]
+OptionDesc          = %ServiceDescription%
+CopyFiles           = MiniFilter.DriverFiles
+
+[DefaultInstall.Services]
+AddService          = %ServiceName%,,MiniFilter.Service
+
+;;
+;; Default uninstall sections
+;;
+
+[DefaultUninstall]
+DelFiles   = MiniFilter.DriverFiles
+
+[DefaultUninstall.Services]
+DelService = veracrypt,0x200      ;Ensure service is stopped before deleting
+
+;
+; Services Section
+;
+
+[MiniFilter.Service]
+DisplayName      = %ServiceName%
+Description      = %ServiceDescription%
+ServiceBinary    = %12%\%DriverName%.sys        ;%windir%\system32\drivers\
+Dependencies     = "FltMgr"
+ServiceType      = 2                            ;SERVICE_FILE_SYSTEM_DRIVER
+;StartType        = 0                           ;SERVICE_BOOT_START
+StartType        = 3                            ;SERVICE_DEMAND_START
+ErrorControl     = 1                            ;SERVICE_ERROR_NORMAL
+LoadOrderGroup   = "FSFilter Encryption"
+
+;
+; Copy Files
+;
+
+[MiniFilter.DriverFiles]
+%DriverName%.sys
+
+[SourceDisksFiles]
+veracrypt.sys = 1,,
+
+[SourceDisksNames]
+1 = %DiskId1%,,,
+
+;;
+;; String Section
+;;
+
+[Strings]
+ProviderString          = "IDRIX"
+ServiceDescription      = "veracrypt"
+ServiceName             = "veracrypt"
+DriverName              = "veracrypt"
+DiskId1                 = "VeraCrypt Device Installation Disk"
+
diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat
new file mode 100644
index 0000000000000000000000000000000000000000..a7702aa91f199a49819da18b0bc36c13c52ab8c6
GIT binary patch
literal 10558
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
LJI^s?b-eq3K6=LT

literal 0
HcmV?d00001

diff --git a/src/Release/Setup Files/veracrypt.sys b/src/Release/Setup Files/veracrypt.sys
index 832ca495ca696a67079c1085fe1e437a932b3a40..bf33021aeb08a454f480aaa00a8da18c6b8a115e 100644
GIT binary patch
delta 3767
zcmai1c{Egi8=o0thPe%<Av=R1!kA%<^_MX*h&D?yD21eKSxUrY$dU;mBm0u2B83cD
zk|mKXRF)!=od~H!@AST%&b$21dG9%&^SSr=-uwLVe4o$f``m;zT*4aeK>~#9(EgW6
zNst4OrX5KW5Owfig%Fn>m_tXPPGGQHMLG8*i9;-X-NPK}W1i>ZkWqS#CRi?fyEkgP
z7t8^K11|P<FO*9Al`qOfnVSO`2XGE}IN)WQC?mLC1Ppmnb&ts8n`gkA*5RR)BDO<3
zqS)ovM{M{S!WaeiXUQzX(HuI-4XE)8gTSC)*KcNJa|4p#0aiUXAP0WH8s`S$xriVH
z%MS*~0U97x5CvomvIZHlZovRHmo{g`3J&c4kChNOaFGq=0pN!OK``Duk*1LwNH83d
z!#K5qXPjDON!tSZ1tY-emyFBMRo1c>**<p*MJm6Jv)LiGz(HYdGM-_s&+7F8I_XY^
zDOb_2sE<_de}7e%haB5{8#{|f{z(c3bAzA^Fi6j>v7mKX5kn(sw=Si=<>%Qv)!b?!
zU6P8L+EEwjDj^HXW41KZ-*VI)R@-hG62QK$NwHN3gfIKVN~AO<PC1vpFwF4~-cUU9
z{n?TdE1|~KQMSB$-jV)V6nNfZw(92WZ0RgnqNF=%<6}2kC%idWF6M5WYA?HNcWFRV
zjSsxn>4@=1w@ah^Uh2$&qInPM*`3ixufkYwCWqS7n)^B*LtE_T^hW~GBD9Hb)9OyA
zLC%#o62Bwt#%yw3oGyF(FrZ9NBo`HzKU#UIWZZWtIgN0&8d0jMKKH;jhlVN09zRi%
zv30_E6;hlm60X-gt5DXqerC==s^Pi}u}5N7E0<wr%xd!i+UZ0B5sz2b&>+z8a(@cN
z3nlD=3Z~}v9Cp<E%KYTn9(9^%U2rsgvF~rHsqGOz_WdngO3MPd{#kMa2RoEnm9HHp
z$p!^4Eq-9DC|=x4t6A>r)6_#`$>lw0be4)~R~6BEtyKJQR)KE!1AqR7|B(X-VE1bn
z(KX&$V%k-F*KjE?nh_G~D<*BO%ZujT&bU5vT_)&kKSEB>IlhPICo^{hHBxwK&sY9i
zLQCYd973bX^$5dC`|7NffpFHs+eJ)Ls^4@(<MSplmD$&&BJ-a5ANFXERjN!+-M7gL
z@_PO)E9tQI#}Chr70KK*INrV4o<vjOy)JR4HO+9qt;bIOGW3VdZk~m3c~D+g#~K)F
z`*Xmjz$PqXUn<XvVx`gh9Z<>#$f)_xnt}xBmw1K=35HOHfuUfA76b|=FiaF!Q@(&Z
z22~iVR5u~J?%K5BB{BaL(_}~0sCSWP-#O{6P?q!5i0$nMum$NQZPj{mS>%HkjQt{w
zTdEjdtnhsAVl3Okn50~G)zb8Ds(xv_{Mq~VqhwRmoIg_2>OkIDnR499gyzRxts7!|
zQ4U|<-Ax!b&(lhCB%8)P63L^Iniop4LlYjhgfj20j}EG!$5U_5tmvetJZYkb>QxQS
zIGhdo=@eK4mN+^S-PEt>+51F}z?fWI^;k`9fp67My&5{i&R$I5&vy5!uO)m!d)>R>
zDRQvVN|Wz&X@S+3YkZ2slfL|ynKM@#iORP0MDC?@xo=h?qgOM0>Mmk}ZC*=SSw_;n
z#5*EPj)-8DP3we3Y7H)G2sSKgwl&Dypql5<NiDva0ZXqyb=BVzyyq<LKKbEJS?CQ(
zF+DN2q1bpx>qo!oqWOH6NA2k_m0p%z3=l#+(O-Z;++V9BL*HVNDoJ^F4^`xth5H2~
zX1cVd(r*Vt1T6*yZle`MtEQ#0{nq4rZW`=d@)zM(#}l;iznfo^$d<SUwD9Wvd8Xmj
z{#^{RPz*VOf^L#RyISuH7`EPfr6m*GG|uIH{Atdi7YlA-=0Ys-WT1*}4^>`XWWlV5
zo}S4x`^?OCp=IRx4%P4J+SSWfVHTGWo$S*wYM5|3WbbvHz3ue6ge+!TAV>=rda<Ll
z8BUcpejFX1cEUZM(L-Lt4)%@(YNw1zKpQ<~U!sQ!!Z`I)7Oag9gwN6i)CQ#5dqNq(
zim<4Ie(<ehjCU0^Z|H5<ofWTkK|Ix0HN_Z4*S;!wg+LP{K1l_2({B~}l^0^C9Y$UE
z`BtVDzSZ@|h<4$-aG7Cz?~XcgdtG~Dm|oHWnWdd%A65PN{KcN@0k%&Y1_z{NXREdv
z-b}`zyB^LBnLo6QN371S#A6Fc4abD{^}?RqdXV-Y_NHv`I^QSJIY&GLtM#XJzg!%v
z$O&OtTfTth|Ca+T1$ctw{)}e`EwQC;1L9!J|C0vGt^jbSyM$&(u6u?HV`0`$?4?%)
z1Lom;9feMY-MVE}scRh;5*J23c+0LGq7}>>z9-}*q#(jA-y@p;ZGXA=4@)(P-l1n#
z3582=C5am-0ihE5`Ez>83CViGXEp`IxEFQV1&{BeyOGUgxSu;N_GfkZDSlnlSE{v9
z<(>1RVPpDV=%Ezy220?ucr|^>dz8+s^KU<*WU*{L`dV6Wa%<eW>dHFRvn)9hGONF%
zDCiz8r8e(g<Es8Z{sEcsfvI6;ozxCQTUD*BV*-@^0`YeJ^Q*PpwsH>nyvM&e!=o_R
za!Tf3v>ow@A<h;#vDbXQ_djy02(R12?t$4;&v_RT30-x$3^WzbKvVws5EmE6htTSr
z816sz11-%7iL+J;0V^uGbH*(Y0__s2h*{P{PIewlC?Ry1(fX!09y3WL@{$l3tvpUX
zSy6<O=eJx41Ux|thu0y}@Nftid<DWa&AL_uL?X3`8b+!bT2zuMm4IhS76Z!Q4z^h_
z5DnwMW9>6^sWHNJ;-8bl9oGB%Kn6;KCXD3d)WK^Jv@}VY8Z=fy5pd;y(<rhi4*(f@
zN%B>Z!jDJ$Gsn2xa3iTVOyY0G_#Q~}UnP=9&!LJ2+7d(ger9Xx(u-V}=hIKNirVc>
zcD$i>uyOGz*=sla#=ystFH-v5hf!9$&qVa~oxUyYB^j&~tMGyMzW=nvkL++Z6*(ew
z2f1mxQIRe%x<lgj0kP&3ES02`;4ms_LVwLNpj?OlELPhcH@{Qhp$TOJTCYQDX{~Ks
zsH%$#%V>XBPS*b`e_p&EAFyrD?I$TnKn*PGK3RB)9yMxj*)|=wZNUZd2!*a1!$@XT
zkG76UqTWTja8U$wKHaz4MMc>=gzThUG`--XbW%nv$tpwE-7BN=Qc#?Qc7%|q2kt~J
zgbNG;=QF_Kcm`M)FA3wak>rDNj%of^hMTpknQIMZmcvXf+in;B)ev_4LtqD(&T~to
z03NI6iw#hT!$d%~5V>W1;}6tPk#}1oF`2b9MtV0pAL&lVQVY=iOpJK3uC0X7hM(tk
zpd4=O6={3{OMUEbu|o2;%&eN6OlGz#-HW-~;LGTLoNjY3hoSRc6gP+}HICsjZ&aHA
zWmN}9jdZ*TsK!AnnMqpLq!j2zlS78CaW5$~$I$|HqHY1T-4S<YrQ?Eo#FMLa96fFA
z77(G&Uf)FOO@EJ8J6d7`J?!gdP!8g1j%)g{_xa6x?+4tf3W=VTPCVt5m{GdZ@G+UX
zex|m%)n`QK$QYIlnortqz#Bx=GjH@ech)k(DmNW!WOtHM>bp#C^!kBHE6-(c`QsT7
z2TrTv!zOZBu|>euzw0rVN&qeBsQct-{W!l;hcBPYMu1+RnC$!-E4C7Nb1FFB3NQQT
z(9lpP5Q&-u+MfXNcL48?*ZnQP2s;F45KzJI!6P8tpixc&2pIHBG9U<qT>1M(G~r*X
zm)H7PZI1vIeyJ;|xd=SZueZ3QBCfEOj{|~q`7KE2^EjKr=hLE06Ngd}jfT{2B<T=?
z?SQ(Gl@`cz0Rw;1J9ZG-Yl$g!9Bbh7L&QuZ#tY}Y=<Gbbx1kQM{_gaP>8?EoT}1?Q
zGmU~j7Lcq4DM}_&_7gps3;n~Fy<XI0pF<f+84h|Y-SiaanN&{5qWfNsnPo3FV;v>w
zIZ-6+Wp_FG5DYr=u${!&XNJd~3M~6XDPEqsiCELt#J>34!d4&qTxHj__}3YdeD6za
zG$nvaC8*HEP0=>t(Y`7U@BJjipF-14G{3SCa2Gb1G%XnTU^;wE{FVsyY=hQpqQU;o
zFPp2c>dbKKb0as*J_d@qPu|j-<u$u)2r=Pj?P3Fo|6?O;HbBPst1ncHDeq@-hmf`J
zeNyUDq<!yu=(O1q+@F%xu-`wBC0q?i{r%3GRRc`=e|Zz0BPfT2nW6cf0O)F9|6S|v
z_wuX1k8S<?1P1);FM=nUe_0^+maw<*=7nAT-{zfX3;W#X_CE8-vuizw8-6RT^H%gx
zdAw%3#F+bd8LI5vvn(*K*n+(kawA8!izuDKQtoM{pD(ZJ800G$S?O@6OjBvrv)sw~
zMrR%xeAAEGrK+r_M<(6IiPN($=2w^(!;ybw_&vT79J$kguTQ3}t+PJ!R927!TM_B}
zar(%GHG9RJ#7C#M8uTlClegcPsJ~Rcv#l)c6n48^VbcqlvqIjl+G*Ps<6N1Q<UTm|
zT#$?sCvU@aEyP;<`7EuD!Fa|`)>;?@E%9D{mPd5dsYCkv2Wqzz>0CIk;?UT=)EYp!
VvX3F>+H+2owm-JU?CdW){|7&~VDkU~

delta 3812
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
K$&tRD3i~gT!(ws(

diff --git a/src/Setup/ComSetup.cpp b/src/Setup/ComSetup.cpp
index 8d59a3f7..64078076 100644
--- a/src/Setup/ComSetup.cpp
+++ b/src/Setup/ComSetup.cpp
@@ -11,10 +11,10 @@
 */
 
 #define TC_MAIN_COM_VERSION_MAJOR 2
-#define TC_MAIN_COM_VERSION_MINOR 9
+#define TC_MAIN_COM_VERSION_MINOR 10
 
 #define TC_FORMAT_COM_VERSION_MAJOR 2
-#define TC_FORMAT_COM_VERSION_MINOR 7
+#define TC_FORMAT_COM_VERSION_MINOR 8
 
 #include <atlbase.h>
 #include <comdef.h>
@@ -39,9 +39,9 @@ extern "C" BOOL RegisterComServers (wchar_t *modulePath)
 	UnRegisterTypeLib (LIBID_TrueCryptMainCom, TC_MAIN_COM_VERSION_MAJOR, TC_MAIN_COM_VERSION_MINOR, 0, SYS_WIN32);
 	UnRegisterTypeLib (LIBID_TrueCryptFormatCom, TC_FORMAT_COM_VERSION_MAJOR, TC_FORMAT_COM_VERSION_MINOR, 0, SYS_WIN32);
 	// unregister older versions that may still exist
-	for (WORD i = 5; i >= 1; i--)
+	for (WORD i = 6; i >= 1; i--)
 		UnRegisterTypeLib (LIBID_TrueCryptMainCom, TC_MAIN_COM_VERSION_MAJOR, TC_MAIN_COM_VERSION_MINOR-i, 0, SYS_WIN32);
-	for (WORD i = 3; i >= 1; i--)
+	for (WORD i = 4; i >= 1; i--)
 		UnRegisterTypeLib (LIBID_TrueCryptFormatCom, TC_FORMAT_COM_VERSION_MAJOR, TC_FORMAT_COM_VERSION_MINOR-i, 0, SYS_WIN32);
 
 	wchar_t setupModule[MAX_PATH];
@@ -78,9 +78,9 @@ extern "C" BOOL UnregisterComServers (wchar_t *modulePath)
 		return FALSE;
 
 	// unregister older versions that may still exist
-	for (WORD i = 5; i >= 1; i--)
+	for (WORD i = 6; i >= 1; i--)
 		UnRegisterTypeLib (LIBID_TrueCryptMainCom, TC_MAIN_COM_VERSION_MAJOR, TC_MAIN_COM_VERSION_MINOR-i, 0, SYS_WIN32);
-	for (WORD i = 3; i >= 1; i--)
+	for (WORD i = 4; i >= 1; i--)
 		UnRegisterTypeLib (LIBID_TrueCryptFormatCom, TC_FORMAT_COM_VERSION_MAJOR, TC_FORMAT_COM_VERSION_MINOR-i, 0, SYS_WIN32);
 
 	wchar_t module[1024];
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index f6ea93fe..46583c46 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -747,6 +747,12 @@ BOOL DoFilesInstall (HWND hwndDlg, wchar_t *szDestDir)
 					StringCbCopyNW (curFileName, sizeof(curFileName), FILENAME_64BIT_DRIVER, sizeof (FILENAME_64BIT_DRIVER));
 				}
 
+				if (Is64BitOs ()
+					&& wcscmp (szFiles[i], L"Averacrypt.cat") == 0)
+				{
+					StringCbCopyNW (curFileName, sizeof(curFileName), L"veracrypt-x64.cat", sizeof (L"veracrypt-x64.cat"));
+				}
+
 				if (Is64BitOs ()
 					&& wcscmp (szFiles[i], L"AVeraCrypt.exe") == 0)
 				{
@@ -2289,45 +2295,9 @@ void DoInstall (void *arg)
 
 void SetInstallationPath (HWND hwndDlg)
 {
-	HKEY hkey;
 	BOOL bInstallPathDetermined = FALSE;
-	wchar_t path[MAX_PATH+20];
-	ITEMIDLIST *itemList;
-
-	memset (InstallationPath, 0, sizeof (InstallationPath));
-
-	// Determine if VeraCrypt is already installed and try to determine its "Program Files" location
-	if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\VeraCrypt", 0, KEY_READ | KEY_WOW64_32KEY, &hkey) == ERROR_SUCCESS)
-	{
-		/* Default 'UninstallString' registry strings written by VeraCrypt:
-		------------------------------------------------------------------------------------
-		5.0+	"C:\Program Files\VeraCrypt\VeraCrypt Setup.exe" /u
-		*/
-
-		wchar_t rv[MAX_PATH*4];
-		DWORD size = sizeof (rv);
-		if (RegQueryValueEx (hkey, L"UninstallString", 0, 0, (LPBYTE) &rv, &size) == ERROR_SUCCESS && wcsrchr (rv, L'/'))
-		{
-			size_t len = 0;
-
-			// Cut and paste the location (path) where VeraCrypt is installed to InstallationPath
-			if (rv[0] == L'"')
-			{
-				len = wcsrchr (rv, L'/') - rv - 2;
-				StringCchCopyNW (InstallationPath, ARRAYSIZE(InstallationPath), rv + 1, len);
-				InstallationPath [len] = 0;
-				bInstallPathDetermined = TRUE;
-
-				if (InstallationPath [wcslen (InstallationPath) - 1] != L'\\')
-				{
-					len = wcsrchr (InstallationPath, L'\\') - InstallationPath;
-					InstallationPath [len] = 0;
-				}
-			}
-
-		}
-		RegCloseKey (hkey);
-	}
+	
+	GetInstallationPath (hwndDlg, InstallationPath, ARRAYSIZE (InstallationPath), &bInstallPathDetermined);
 
 	if (bInstallPathDetermined)
 	{
@@ -2343,36 +2313,6 @@ void SetInstallationPath (HWND hwndDlg)
 				bChangeMode = TRUE;
 		}
 	}
-	else
-	{
-		/* VeraCrypt is not installed or it wasn't possible to determine where it is installed. */
-
-		// Default "Program Files" path.
-		SHGetSpecialFolderLocation (hwndDlg, CSIDL_PROGRAM_FILES, &itemList);
-		SHGetPathFromIDList (itemList, path);
-
-		if (Is64BitOs())
-		{
-			// Use a unified default installation path (registry redirection of %ProgramFiles% does not work if the installation path is user-selectable)
-			wstring s = path;
-			size_t p = s.find (L" (x86)");
-			if (p != wstring::npos)
-			{
-				s = s.substr (0, p);
-				if (_waccess (s.c_str(), 0) != -1)
-					StringCbCopyW (path, sizeof (path), s.c_str());
-			}
-		}
-
-		StringCbCatW (path, sizeof(path), L"\\VeraCrypt\\");
-		StringCbCopyW (InstallationPath, sizeof(InstallationPath), path);
-	}
-
-	// Make sure the path ends with a backslash
-	if (InstallationPath [wcslen (InstallationPath) - 1] != L'\\')
-	{
-		StringCbCatW (InstallationPath, sizeof(InstallationPath), L"\\");
-	}
 }
 
 
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index 12b4159f..ada20fb9 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -27,6 +27,8 @@ static wchar_t *szFiles[]=
 	L"AVeraCrypt.exe",
 	L"AVeraCryptExpander.exe",
 	L"AVeraCrypt Format.exe",
+	L"Averacrypt.inf",
+	L"Averacrypt.cat",
 	L"Averacrypt.sys",
 	L"Dveracrypt.sys",
 	L"AVeraCrypt Setup.exe",
@@ -46,7 +48,10 @@ static wchar_t *szCompressedFiles[]=
 	L"VeraCrypt-x64.exe",
 	L"VeraCryptExpander-x64.exe",
 	L"VeraCrypt Format-x64.exe",
+	L"veracrypt.inf",
+	L"veracrypt.cat",
 	L"veracrypt.sys",
+	L"veracrypt-x64.cat",
 	L"veracrypt-x64.sys",
 	L"Languages.zip",
 	L"docs.zip"