Avoid changing metadata (ownership, permission,etc) of /usr when unpacking VeraCrypt tar package

src/Boot/Windows/BootCommon.h

@@ -13,7 +13,7 @@
 #include "BootDefs.h"
 
 // The user will be advised to upgrade the rescue disk if upgrading from the following or any previous version
-#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x060a
+#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x010a
 
 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS)
 

src/Boot/Windows/BootMain.cpp

@@ -1081,7 +1081,7 @@ void main ()
 	// Check whether the user is not using the Rescue Disk to create a hidden system
 
 	if (ReadWriteMBR (false, BootDrive, true) == BiosResultSuccess
-		&& *(uint32 *) (SectorBuffer + 6) == 0x65757254
+		&& *(uint32 *) (SectorBuffer + 6) == 0x61726556
 		&& *(uint32 *) (SectorBuffer + 10) == 0x70797243
 		&& (SectorBuffer[TC_BOOT_SECTOR_CONFIG_OFFSET] & TC_BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE) != TC_HIDDEN_OS_CREATION_PHASE_NONE)
 	{

src/Common/BaseCom.cpp

@@ -15,7 +15,7 @@
 #include "Dlgcode.h"
 #include "Registry.h"
 
-using namespace TrueCrypt;
+using namespace VeraCrypt;
 
 HRESULT CreateElevatedComObject (HWND hwnd, REFGUID guid, REFIID iid, void **ppv)
 {

src/Common/BootEncryption.cpp

@@ -32,7 +32,7 @@
 #include "Mount/MainCom.h"
 #endif
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 #if !defined (SETUP)
 

src/Common/BootEncryption.h

@@ -17,7 +17,7 @@
 
 using namespace std;
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class File
 	{

src/Common/Dlgcode.c

@@ -61,7 +61,7 @@
 #include "Setup/Setup.h"
 #endif
 
-using namespace TrueCrypt;
+using namespace VeraCrypt;
 
 LONG DriverVersion;
 
@@ -3984,7 +3984,7 @@ static BOOL CALLBACK LocalizeDialogEnum( HWND hwnd, LPARAM font)
 void LocalizeDialog (HWND hwnd, char *stringId)
 {
 	LastDialogId = stringId;
-	SetWindowLongPtr (hwnd, GWLP_USERDATA, (LONG_PTR) 'TRUE');
+	SetWindowLongPtr (hwnd, GWLP_USERDATA, (LONG_PTR) 'VERA');
 	SendMessage (hwnd, WM_SETFONT, (WPARAM) hUserFont, 0);
 
 	if (stringId == NULL)
@@ -8370,7 +8370,7 @@ void HandleDriveNotReadyError ()
 
 BOOL CALLBACK CloseTCWindowsEnum (HWND hwnd, LPARAM lParam)
 {
-	if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'TRUE')
+	if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'VERA')
 	{
 		char name[1024] = { 0 };
 		GetWindowText (hwnd, name, sizeof (name) - 1);
@@ -8395,7 +8395,7 @@ BOOL CALLBACK FindTCWindowEnum (HWND hwnd, LPARAM lParam)
 	if (*(HWND *)lParam == hwnd)
 		return TRUE;
 
-	if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'TRUE')
+	if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'VERA')
 	{
 		char name[32] = { 0 };
 		GetWindowText (hwnd, name, sizeof (name) - 1);

src/Common/Exception.h

@@ -12,7 +12,7 @@
 #include "Platform/PlatformBase.h"
 #include "Dlgcode.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct Exception
 	{

src/Common/Keyfiles.c

@@ -23,7 +23,7 @@
 #include "Platform/Finally.h"
 #include "Platform/ForEach.h"
 
-using namespace TrueCrypt;
+using namespace VeraCrypt;
 
 #define stat _stat
 #define S_IFDIR _S_IFDIR

src/Common/SecurityToken.cpp

@@ -30,7 +30,7 @@
 
 using namespace std;
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	SecurityTokenKeyfile::SecurityTokenKeyfile (const SecurityTokenKeyfilePath &path)
 	{

src/Common/SecurityToken.h

@@ -49,7 +49,7 @@
 #define TC_SECURITY_TOKEN_KEYFILE_URL_SLOT L"slot"
 #define TC_SECURITY_TOKEN_KEYFILE_URL_FILE L"file"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct SecurityTokenInfo
 	{

src/Common/Tcdefs.h

@@ -252,8 +252,8 @@ void EraseMemory (void *memory, int size);
 #define MAX_URL_LENGTH	2084 /* Internet Explorer limit. Includes the terminating null character. */
 
 #define TC_HOMEPAGE "http://www.idrix.fr/"
-#define TC_APPLINK "http://www.idrix.fr/"
+#define TC_APPLINK "http://sourceforge.net/projects/veracrypt/"
-#define TC_APPLINK_SECURE "https://www.idrix.fr/"
+#define TC_APPLINK_SECURE "https://sourceforge.net/projects/veracrypt/"
 
 enum
 {

src/Common/Volumes.c

@@ -64,7 +64,7 @@
 // Unencrypted:
 // 0		64		Salt
 // Encrypted:
-// 64		4		ASCII string 'TRUE'
+// 64		4		ASCII string 'VERA'
 // 68		2		Header version
 // 70		2		Required program version
 // 72		4		CRC-32 checksum of the (decrypted) bytes 256-511
@@ -86,7 +86,7 @@
 // Unencrypted:
 // 0		64		Salt
 // Encrypted:
-// 64		4		ASCII string 'TRUE'
+// 64		4		ASCII string 'VERA'
 // 68		2		Header version
 // 70		2		Required program version
 // 72		4		CRC-32 checksum of the (decrypted) bytes 256-511
@@ -107,7 +107,7 @@
 // Unencrypted:
 // 0		64		Salt
 // Encrypted:
-// 64		4		ASCII string 'TRUE'
+// 64		4		ASCII string 'VERA'
 // 68		2		Header version
 // 70		2		Required program version
 // 72		4		CRC-32 checksum of the (decrypted) bytes 256-511
@@ -401,7 +401,7 @@ KeyReady:	;
 
 				DecryptBuffer (header + HEADER_ENCRYPTED_DATA_OFFSET, HEADER_ENCRYPTED_DATA_SIZE, cryptoInfo);
 
-				// Magic 'TRUE'
+				// Magic 'VERA'
 				if (GetHeaderField32 (header, TC_HEADER_OFFSET_MAGIC) != 0x56455241)
 					continue;
 
@@ -614,7 +614,7 @@ int ReadVolumeHeader (BOOL bBoot, char *header, Password *password, PCRYPTO_INFO
 		// Try to decrypt header 
 		DecryptBuffer (header + HEADER_ENCRYPTED_DATA_OFFSET, HEADER_ENCRYPTED_DATA_SIZE, cryptoInfo);
 		
-		// Check magic 'TRUE' and CRC-32 of header fields and master keydata
+		// Check magic 'VERA' and CRC-32 of header fields and master keydata
 		if (GetHeaderField32 (header, TC_HEADER_OFFSET_MAGIC) != 0x56455241
 			|| (GetHeaderField16 (header, TC_HEADER_OFFSET_VERSION) >= 4 && GetHeaderField32 (header, TC_HEADER_OFFSET_HEADER_CRC) != GetCrc32 (header + TC_HEADER_OFFSET_MAGIC, TC_HEADER_OFFSET_HEADER_CRC - TC_HEADER_OFFSET_MAGIC))
 			|| GetHeaderField32 (header, TC_HEADER_OFFSET_KEY_AREA_CRC) != GetCrc32 (header + HEADER_MASTER_KEYDATA_OFFSET, MASTER_KEYDATA_SIZE))

src/Core/Core.h

@@ -11,7 +11,7 @@
 
 #include "CoreBase.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	extern auto_ptr <CoreBase> Core;
 	extern auto_ptr <CoreBase> CoreDirect;

src/Core/CoreBase.cpp

@@ -12,7 +12,7 @@
 #include "RandomNumberGenerator.h"
 #include "Volume/Volume.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	CoreBase::CoreBase ()
 		: DeviceChangeInProgress (false)

src/Core/CoreBase.h

@@ -21,7 +21,7 @@
 #include "HostDevice.h"
 #include "MountOptions.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class CoreBase
 	{

src/Core/CoreException.cpp

@@ -9,7 +9,7 @@
 #include "CoreException.h"
 #include "Platform/SerializerFactory.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	void ElevationFailed::Deserialize (shared_ptr <Stream> stream)
 	{

src/Core/CoreException.h

@@ -11,7 +11,7 @@
 
 #include "Platform/Platform.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct ElevationFailed : public ExecutedProcessFailed
 	{

src/Core/FatFormatter.cpp

@@ -15,7 +15,7 @@
 #include "FatFormatter.h"
 #include "RandomNumberGenerator.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct fatparams
 	{

src/Core/FatFormatter.h

@@ -11,7 +11,7 @@
 
 #include "Platform/Platform.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class FatFormatter
 	{

src/Core/HostDevice.cpp

@@ -9,7 +9,7 @@
 #include "HostDevice.h"
 #include "Platform/SerializerFactory.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	void HostDevice::Deserialize (shared_ptr <Stream> stream)
 	{

src/Core/HostDevice.h

@@ -12,7 +12,7 @@
 #include "Platform/Platform.h"
 #include "Platform/Serializable.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct HostDevice;
 	typedef list < shared_ptr <HostDevice> > HostDeviceList;

src/Core/MountOptions.cpp

@@ -10,7 +10,7 @@
 #include "Platform/MemoryStream.h"
 #include "Platform/SerializerFactory.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	void MountOptions::CopyFrom (const MountOptions &other)
 	{

src/Core/MountOptions.h

@@ -15,7 +15,7 @@
 #include "Volume/VolumeSlot.h"
 #include "Volume/VolumePassword.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct MountOptions : public Serializable
 	{

src/Core/RandomNumberGenerator.cpp

@@ -15,7 +15,7 @@
 #include "RandomNumberGenerator.h"
 #include "Volume/Crc32.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	void RandomNumberGenerator::AddSystemDataToPool (bool fast)
 	{

src/Core/RandomNumberGenerator.h

@@ -13,7 +13,7 @@
 #include "Volume/Hash.h"
 #include "Common/Random.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class RandomNumberGenerator
 	{

src/Core/Unix/CoreService.cpp

@@ -20,7 +20,7 @@
 #include "CoreServiceRequest.h"
 #include "CoreServiceResponse.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	template <class T>
 	auto_ptr <T> CoreService::GetResponse ()

src/Core/Unix/CoreService.h

@@ -14,7 +14,7 @@
 #include "Platform/Unix/Pipe.h"
 #include "Core/Core.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	// This service facilitates process forking and elevation of user privileges
 	class CoreService

src/Core/Unix/CoreServiceProxy.h

@@ -12,7 +12,7 @@
 #include "CoreService.h"
 #include "Volume/VolumePasswordCache.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	template <class T>
 	class CoreServiceProxy : public T

src/Core/Unix/CoreServiceRequest.cpp

@@ -10,7 +10,7 @@
 #include "CoreServiceRequest.h"
 #include "Platform/SerializerFactory.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	void CoreServiceRequest::Deserialize (shared_ptr <Stream> stream)
 	{

src/Core/Unix/CoreServiceRequest.h

@@ -12,7 +12,7 @@
 #include "Platform/Serializable.h"
 #include "Core/Core.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct CoreServiceRequest : public Serializable
 	{

src/Core/Unix/CoreServiceResponse.cpp

@@ -9,7 +9,7 @@
 #include "CoreServiceResponse.h"
 #include "Platform/SerializerFactory.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	// CheckFilesystemResponse
 	void CheckFilesystemResponse::Deserialize (shared_ptr <Stream> stream)

src/Core/Unix/CoreServiceResponse.h

@@ -12,7 +12,7 @@
 #include "Platform/Serializable.h"
 #include "Core/Core.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct CoreServiceResponse : public Serializable
 	{

src/Core/Unix/CoreUnix.cpp

@@ -18,7 +18,7 @@
 #include "Driver/Fuse/FuseService.h"
 #include "Volume/VolumePasswordCache.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	CoreUnix::CoreUnix ()
 	{
@@ -205,7 +205,7 @@ namespace TrueCrypt
 
 	string CoreUnix::GetDefaultMountPointPrefix () const
 	{
-		const char *envPrefix = getenv ("TRUECRYPT_MOUNT_PREFIX");
+		const char *envPrefix = getenv ("VERACRYPT_MOUNT_PREFIX");
 		if (envPrefix && !string (envPrefix).empty())
 			return envPrefix;
 		
@@ -215,7 +215,7 @@ namespace TrueCrypt
 		if (FilesystemPath ("/mnt").IsDirectory())
 			return "/mnt/veracrypt";
 		
-		return GetTempDirectory() + "/truecrypt_mnt";
+		return GetTempDirectory() + "/veracrypt_mnt";
 	}
 
 	uint32 CoreUnix::GetDeviceSectorSize (const DevicePath &devicePath) const

src/Core/Unix/CoreUnix.h

@@ -14,7 +14,7 @@
 #include "Core/CoreBase.h"
 #include "Core/Unix/MountedFilesystem.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class CoreUnix : public CoreBase
 	{
@@ -51,7 +51,7 @@ namespace TrueCrypt
 		virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); }
 		virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) const;
 		virtual string GetDefaultMountPointPrefix () const;
-		virtual string GetFuseMountDirPrefix () const { return ".truecrypt_aux_mnt"; }
+		virtual string GetFuseMountDirPrefix () const { return ".veracrypt_aux_mnt"; }
 		virtual MountedFilesystemList GetMountedFilesystems (const DevicePath &devicePath = DevicePath(), const DirectoryPath &mountPoint = DirectoryPath()) const = 0;
 		virtual uid_t GetRealUserId () const;
 		virtual gid_t GetRealGroupId () const;

src/Core/Unix/FreeBSD/CoreFreeBSD.cpp

@@ -16,7 +16,7 @@
 #include "CoreFreeBSD.h"
 #include "Core/Unix/CoreServiceProxy.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	CoreFreeBSD::CoreFreeBSD ()
 	{

src/Core/Unix/FreeBSD/CoreFreeBSD.h

@@ -12,7 +12,7 @@
 #include "System.h"
 #include "Core/Unix/CoreUnix.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class CoreFreeBSD : public CoreUnix
 	{

src/Core/Unix/Linux/CoreLinux.cpp

@@ -22,7 +22,7 @@
 #include "Driver/Fuse/FuseService.h"
 #include "Core/Unix/CoreServiceProxy.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	CoreLinux::CoreLinux ()
 	{

src/Core/Unix/Linux/CoreLinux.h

@@ -12,7 +12,7 @@
 #include "System.h"
 #include "Core/Unix/CoreUnix.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class CoreLinux : public CoreUnix
 	{

src/Core/Unix/MacOSX/CoreMacOSX.cpp

@@ -19,7 +19,7 @@
 #include "Driver/Fuse/FuseService.h"
 #include "Core/Unix/CoreServiceProxy.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	CoreMacOSX::CoreMacOSX ()
 	{

src/Core/Unix/MacOSX/CoreMacOSX.h

@@ -12,7 +12,7 @@
 #include "System.h"
 #include "Core/Unix/FreeBSD/CoreFreeBSD.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class CoreMacOSX : public CoreFreeBSD
 	{

src/Core/Unix/MountedFilesystem.h

@@ -11,7 +11,7 @@
 
 #include "Platform/Platform.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct MountedFilesystem
 	{

src/Core/Unix/Solaris/CoreSolaris.cpp

@@ -15,7 +15,7 @@
 #include "CoreSolaris.h"
 #include "Core/Unix/CoreServiceProxy.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	CoreSolaris::CoreSolaris ()
 	{

src/Core/Unix/Solaris/CoreSolaris.h

@@ -12,7 +12,7 @@
 #include "System.h"
 #include "Core/Unix/CoreUnix.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class CoreSolaris : public CoreUnix
 	{

src/Core/VolumeCreator.cpp

@@ -19,7 +19,7 @@
 #include "VolumeCreator.h"
 #include "FatFormatter.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	VolumeCreator::VolumeCreator ()
 		: SizeDone (0)

src/Core/VolumeCreator.h

@@ -13,7 +13,7 @@
 #include "Volume/Volume.h"
 #include "RandomNumberGenerator.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	
 	struct VolumeCreationOptions

src/Driver/DriveFilter.c

@@ -103,16 +103,7 @@ NTSTATUS LoadBootArguments ()
 			BootArgsValid = TRUE;
 			memset (bootArguments, 0, sizeof (*bootArguments));
 
-			if (BootArgs.BootLoaderVersion < 0x600)
+			BootDriveSignatureValid = TRUE;
-			{
-				BootArgs.HiddenSystemPartitionStart = 0;
-				BootArgs.DecoySystemPartitionStart = 0;
-			}
-
-			if (BootArgs.BootLoaderVersion < 0x630)
-				BootArgs.Flags = 0;
-
-			BootDriveSignatureValid = (BootArgs.BootLoaderVersion >= 0x710);
 
 			Dump ("BootLoaderVersion = %x\n", (int) BootArgs.BootLoaderVersion);
 			Dump ("HeaderSaltCrc32 = %x\n", (int) BootArgs.HeaderSaltCrc32);

src/Driver/Fuse/FuseService.cpp

@@ -30,7 +30,7 @@
 #include "Volume/EncryptionThreadPool.h"
 #include "Core/Core.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	static int fuse_service_access (const char *path, int mask)
 	{

src/Driver/Fuse/FuseService.h

@@ -15,7 +15,7 @@
 #include "Volume/VolumeInfo.h"
 #include "Volume/Volume.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 
 	class FuseService

src/Driver/Ntdriver.c

@@ -906,7 +906,7 @@ NTSTATUS ProcessMainDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION Ex
 					}
 					else
 					{
-						// Determine if the first sector contains a portion of the TrueCrypt Boot Loader
+						// Determine if the first sector contains a portion of the VeraCrypt Boot Loader
 
 						offset.QuadPart = 0;
 
@@ -926,7 +926,7 @@ NTSTATUS ProcessMainDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION Ex
 
 							if (opentest->bDetectTCBootLoader && IoStatus.Information >= TC_SECTOR_SIZE_BIOS)
 							{
-								// Search for the string "TrueCrypt"
+								// Search for the string "VeraCrypt"
 								for (i = 0; i < TC_SECTOR_SIZE_BIOS - strlen (TC_APP_NAME); ++i)
 								{
 									if (memcmp (readBuffer + i, TC_APP_NAME, strlen (TC_APP_NAME)) == 0)
@@ -995,7 +995,7 @@ NTSTATUS ProcessMainDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION Ex
 
 			if (NT_SUCCESS (ntStatus))
 			{
-				// Determine if the first sector contains a portion of the TrueCrypt Boot Loader
+				// Determine if the first sector contains a portion of the VeraCrypt Boot Loader
 				offset.QuadPart = 0;	// MBR
 
 				ntStatus = ZwReadFile (NtFileHandle,
@@ -1033,7 +1033,7 @@ NTSTATUS ProcessMainDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION Ex
 					request->UserConfiguration = 0;
 					request->CustomUserMessage[0] = 0;
 
-					// Search for the string "TrueCrypt"
+					// Search for the string "VeraCrypt"
 					for (i = 0; i < sizeof (readBuffer) - strlen (TC_APP_NAME); ++i)
 					{
 						if (memcmp (readBuffer + i, TC_APP_NAME, strlen (TC_APP_NAME)) == 0)

src/Format/FormatCom.cpp

@@ -20,7 +20,7 @@
 #include "FormatCom_h.h"
 #include "FormatCom_i.c"
 
-using namespace TrueCrypt;
+using namespace VeraCrypt;
 
 static volatile LONG ObjectCount = 0;
 

src/Format/InPlace.c

@@ -35,7 +35,7 @@ IMPORTANT: Due to this issue, functions in this file must not directly interact
 #include "InPlace.h"
 
 using namespace std;
-using namespace TrueCrypt;
+using namespace VeraCrypt;
 
 #define TC_MAX_NONSYS_INPLACE_ENC_WORK_CHUNK_SIZE	(2048 * BYTES_PER_KB)
 #define TC_INITIAL_NTFS_CONCEAL_PORTION_SIZE		(2 * TC_MAX_VOLUME_SECTOR_SIZE)

src/Format/Tcformat.c

@@ -48,7 +48,7 @@
 #include "Wipe.h"
 #include "Xml.h"
 
-using namespace TrueCrypt;
+using namespace VeraCrypt;
 
 enum wizard_pages
 {
@@ -375,7 +375,7 @@ static void localcleanup (void)
 
 static BOOL CALLBACK BroadcastSysEncCfgUpdateCallb (HWND hwnd, LPARAM lParam)
 {
-	if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'TRUE')
+	if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'VERA')
 	{
 		char name[1024] = { 0 };
 		GetWindowText (hwnd, name, sizeof (name) - 1);

src/Main/Application.cpp

@@ -16,7 +16,7 @@
 #endif
 #include "TextUserInterface.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	wxApp* Application::CreateConsoleApp ()
 	{
@@ -36,7 +36,7 @@ namespace TrueCrypt
 
 	FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir)
 	{
-		wxStandardPaths stdPaths;
+		wxStandardPaths& stdPaths = wxStandardPaths::Get();
 		DirectoryPath configDir;
 		
 		if (!Core->IsInPortableMode())
@@ -61,12 +61,12 @@ namespace TrueCrypt
 
 	DirectoryPath Application::GetExecutableDirectory ()
 	{
-		return wstring (wxFileName (wxStandardPaths().GetExecutablePath()).GetPath());
+		return wstring (wxFileName (wxStandardPaths::Get().GetExecutablePath()).GetPath());
 	}
 
 	FilePath Application::GetExecutablePath ()
 	{
-		return wstring (wxStandardPaths().GetExecutablePath());
+		return wstring (wxStandardPaths::Get().GetExecutablePath());
 	}
 
 	void Application::Initialize (UserInterfaceType::Enum type)

src/Main/Application.h

@@ -13,7 +13,7 @@
 #include "UserInterface.h"
 #include "UserInterfaceType.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class Application
 	{

src/Main/CommandLineInterface.cpp

@@ -15,7 +15,7 @@
 #include "LanguageStrings.h"
 #include "UserInterfaceException.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	CommandLineInterface::CommandLineInterface (wxCmdLineParser &parser, UserInterfaceType::Enum interfaceType) :
 		ArgCommand (CommandId::None),
@@ -380,7 +380,7 @@ namespace TrueCrypt
 		ArgQuick = parser.Found (L"quick");
 
 		if (parser.Found (L"random-source", &str))
-			ArgRandomSourcePath = FilesystemPath (str);
+			ArgRandomSourcePath = FilesystemPath (str.wc_str());
 
 		if (parser.Found (L"restore-headers"))
 		{
@@ -471,7 +471,7 @@ namespace TrueCrypt
 
 			if (param1IsFile)
 			{
-				ArgFilePath.reset (new FilePath (parser.GetParam (0)));
+				ArgFilePath.reset (new FilePath (parser.GetParam (0).wc_str()));
 			}
 		}
 
@@ -524,7 +524,7 @@ namespace TrueCrypt
 					arr.Add (L"");
 					continue;
 				}
-				arr.Last() += token.empty() ? L',' : token;
+				arr.Last() += token.empty() ? L"," : token.wc_str();
 			}
 			else
 				arr.Add (token);
@@ -562,12 +562,12 @@ namespace TrueCrypt
 			{
 				filteredVolumes.push_back (volume);
 			}
-			else if (wxString (volume->Path) == pathFilter.GetFullPath())
+			else if (wxString (wstring(volume->Path)) == pathFilter.GetFullPath())
 			{
 				filteredVolumes.push_back (volume);
 			}
-			else if (wxString (volume->MountPoint) == pathFilter.GetFullPath()
+			else if (wxString (wstring(volume->MountPoint)) == pathFilter.GetFullPath()
-				|| (wxString (volume->MountPoint) + wxFileName::GetPathSeparator()) == pathFilter.GetFullPath())
+				|| (wxString (wstring(volume->MountPoint)) + wxFileName::GetPathSeparator()) == pathFilter.GetFullPath())
 			{
 				filteredVolumes.push_back (volume);
 			}

src/Main/CommandLineInterface.h

@@ -17,7 +17,7 @@
 #include "UserPreferences.h"
 #include "UserInterfaceType.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct CommandId
 	{

src/Main/FatalErrorHandler.cpp

@@ -31,7 +31,7 @@
 
 #include "FatalErrorHandler.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	static terminate_handler DefaultTerminateHandler;
 

src/Main/FatalErrorHandler.h

@@ -11,7 +11,7 @@
 
 #include "System.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class FatalErrorHandler
 	{

src/Main/FavoriteVolume.cpp

@@ -11,7 +11,7 @@
 #include "FavoriteVolume.h"
 #include "Xml.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	FavoriteVolumeList FavoriteVolume::LoadList ()
 	{

src/Main/FavoriteVolume.h

@@ -12,7 +12,7 @@
 #include "System.h"
 #include "Main.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	struct FavoriteVolume;
 	typedef list < shared_ptr <FavoriteVolume> > FavoriteVolumeList;

src/Main/Forms/AboutDialog.cpp

@@ -13,7 +13,7 @@
 #include "Main/Resources.h"
 #include "AboutDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	AboutDialog::AboutDialog (wxWindow* parent) : AboutDialogBase (parent)
 	{

src/Main/Forms/AboutDialog.h

@@ -11,7 +11,7 @@
 
 #include "Forms.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	class AboutDialog : public AboutDialogBase
 	{

src/Main/Forms/BenchmarkDialog.cpp

@@ -11,7 +11,7 @@
 #include "Main/GraphicUserInterface.h"
 #include "BenchmarkDialog.h"
 
-namespace TrueCrypt
+namespace VeraCrypt
 {
 	BenchmarkDialog::BenchmarkDialog (wxWindow *parent)
 		: BenchmarkDialogBase (parent)