Merge pull request FreeApophis#12 from waywardgeek/master

Changed more file cases, and fixes to compile with wxgtk 3.0
sky0306 · Jun 9, 2014 · 0ccbbe4 · 0ccbbe4
2 parents ba3c11c + dbd23de
commit 0ccbbe4
Show file tree

Hide file tree

Showing 65 changed files with 3,136 additions and 39 deletions.
diff --git a/Common/APIDRVR.H → Common/Apidrvr.h b/Common/APIDRVR.H → Common/Apidrvr.h
diff --git a/Common/CACHE.C → Common/Cache.c b/Common/CACHE.C → Common/Cache.c
diff --git a/Common/CACHE.H → Common/Cache.h b/Common/CACHE.H → Common/Cache.h
diff --git a/Common/CMDLINE.C → Common/Cmdline.c b/Common/CMDLINE.C → Common/Cmdline.c
diff --git a/Common/CMDLINE.H → Common/Cmdline.h b/Common/CMDLINE.H → Common/Cmdline.h
diff --git a/Common/COMBO.C → Common/Combo.c b/Common/COMBO.C → Common/Combo.c
diff --git a/Common/COMBO.H → Common/Combo.h b/Common/COMBO.H → Common/Combo.h
diff --git a/Common/Common.rc b/Common/Common.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "Resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -487,7 +487,7 @@ IDR_LICENSE             TEXT                    "..\\Resources\\Texts\\License.r
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "Resource.h\0"
 END
 
 2 TEXTINCLUDE 

diff --git a/Common/CRC.C → Common/Crc.c b/Common/CRC.C → Common/Crc.c
diff --git a/Common/CRC.H → Common/Crc.h b/Common/CRC.H → Common/Crc.h
diff --git a/Common/CRYPTO.C → Common/Crypto.c b/Common/CRYPTO.C → Common/Crypto.c
diff --git a/Common/CRYPTO.H → Common/Crypto.h b/Common/CRYPTO.H → Common/Crypto.h
diff --git a/Common/DLGCODE.C → Common/Dlgcode.c b/Common/DLGCODE.C → Common/Dlgcode.c
diff --git a/Common/DLGCODE.H → Common/Dlgcode.h b/Common/DLGCODE.H → Common/Dlgcode.h
diff --git a/Common/ENDIAN.C → Common/Endian.c b/Common/ENDIAN.C → Common/Endian.c
diff --git a/Common/ENDIAN.H → Common/Endian.h b/Common/ENDIAN.H → Common/Endian.h
diff --git a/Common/FAT.C → Common/Fat.c b/Common/FAT.C → Common/Fat.c
diff --git a/Common/FAT.H → Common/Fat.h b/Common/FAT.H → Common/Fat.h
diff --git a/Common/FORMAT.C → Common/Format.c b/Common/FORMAT.C → Common/Format.c
diff --git a/Common/FORMAT.H → Common/Format.h b/Common/FORMAT.H → Common/Format.h
diff --git a/Common/PASSWORD.C → Common/Password.c b/Common/PASSWORD.C → Common/Password.c
diff --git a/Common/PASSWORD.H → Common/Password.h b/Common/PASSWORD.H → Common/Password.h
diff --git a/Common/PKCS5.C → Common/Pkcs5.c b/Common/PKCS5.C → Common/Pkcs5.c
diff --git a/Common/PKCS5.H → Common/Pkcs5.h b/Common/PKCS5.H → Common/Pkcs5.h
diff --git a/Common/PROGRESS.C → Common/Progress.c b/Common/PROGRESS.C → Common/Progress.c
diff --git a/Common/PROGRESS.H → Common/Progress.h b/Common/PROGRESS.H → Common/Progress.h
diff --git a/Common/RANDOM.C → Common/Random.c b/Common/RANDOM.C → Common/Random.c
diff --git a/Common/RANDOM.H → Common/Random.h b/Common/RANDOM.H → Common/Random.h
diff --git a/Common/resource.h → Common/Resource.h b/Common/resource.h → Common/Resource.h
diff --git a/Common/TCDEFS.H → Common/Tcdefs.h b/Common/TCDEFS.H → Common/Tcdefs.h
diff --git a/Common/VOLUMES.C → Common/Volumes.c b/Common/VOLUMES.C → Common/Volumes.c
diff --git a/Common/VOLUMES.H → Common/Volumes.h b/Common/VOLUMES.H → Common/Volumes.h
diff --git a/Crypto/BLOWFISH.H → Crypto/Blowfish.h b/Crypto/BLOWFISH.H → Crypto/Blowfish.h
diff --git a/Crypto/CAST.H → Crypto/Cast.h b/Crypto/CAST.H → Crypto/Cast.h
diff --git a/Crypto/DES.C → Crypto/Des.c b/Crypto/DES.C → Crypto/Des.c
diff --git a/Crypto/DES.H → Crypto/Des.h b/Crypto/DES.H → Crypto/Des.h
diff --git a/Crypto/SHA1.C → Crypto/Sha1.c b/Crypto/SHA1.C → Crypto/Sha1.c
diff --git a/Crypto/SHA1.H → Crypto/Sha1.h b/Crypto/SHA1.H → Crypto/Sha1.h
diff --git a/Driver/Driver.rc b/Driver/Driver.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "Resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "Resource.h\0"
 END
 
 2 TEXTINCLUDE 

diff --git a/Driver/Driver.vcproj b/Driver/Driver.vcproj
@@ -330,7 +330,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\resource.h"
+				RelativePath=".\Resource.h"
 				>
 			</File>
 			<File

diff --git a/Driver/NTDRIVER.C → Driver/Ntdriver.c b/Driver/NTDRIVER.C → Driver/Ntdriver.c
diff --git a/Driver/NTDRIVER.H → Driver/Ntdriver.h b/Driver/NTDRIVER.H → Driver/Ntdriver.h
diff --git a/Driver/NTVOL.C → Driver/Ntvol.c b/Driver/NTVOL.C → Driver/Ntvol.c
diff --git a/Driver/NTVOL.H → Driver/Ntvol.h b/Driver/NTVOL.H → Driver/Ntvol.h
diff --git a/Driver/resource.h → Driver/Resource.h b/Driver/resource.h → Driver/Resource.h
diff --git a/Format/Format.rc b/Format/Format.rc
@@ -1,14 +1,14 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "Resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "afxres.h"
-#include "..\\common\\resource.h"
+#include "..\\common\\Resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -65,7 +65,7 @@ END
 // HEADER
 //
 
-IDR_FORMAT_RSRC_HEADER  HEADER                  "resource.h"
+IDR_FORMAT_RSRC_HEADER  HEADER                  "Resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -426,13 +426,13 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "Resource.h\0"
 END
 
 2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
-    "#include ""..\\\\common\\\\resource.h""\r\n"
+    "#include ""..\\\\common\\\\Resource.h""\r\n"
     "\0"
 END
 

diff --git a/Format/Format.vcproj b/Format/Format.vcproj
@@ -493,7 +493,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\resource.h"
+				RelativePath=".\Resource.h"
 				>
 			</File>
 			<File

diff --git a/Format/resource.h → Format/Resource.h b/Format/resource.h → Format/Resource.h
diff --git a/Format/TCFORMAT.C → Format/Tcformat.c b/Format/TCFORMAT.C → Format/Tcformat.c
diff --git a/Format/TCFORMAT.H → Format/Tcformat.h b/Format/TCFORMAT.H → Format/Tcformat.h
diff --git a/Main/Application.cpp b/Main/Application.cpp
@@ -36,7 +36,6 @@ namespace TrueCrypt
 
 	FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir)
 	{
-		wxStandardPaths stdPaths;
 		DirectoryPath configDir;
 
 		if (!Core->IsInPortableMode())
@@ -46,7 +45,7 @@ namespace TrueCrypt
 			configPath.Normalize();
 			configDir = wstring (configPath.GetFullPath());
 #else
-			configDir = wstring (stdPaths.GetUserDataDir());
+			configDir = wstring (wxStandardPaths::Get().GetUserDataDir());
 #endif
 		}
 		else
@@ -61,12 +60,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)

diff --git a/Main/CommandLineInterface.cpp b/Main/CommandLineInterface.cpp
@@ -380,7 +380,7 @@ namespace TrueCrypt
 		ArgQuick = parser.Found (L"quick");
 
 		if (parser.Found (L"random-source", &str))
-			ArgRandomSourcePath = FilesystemPath (str);
+			ArgRandomSourcePath = FilesystemPath (str.ToStdWstring());
 
 		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).ToStdWstring()));
 			}
 		}
 
@@ -524,7 +524,7 @@ namespace TrueCrypt
 					arr.Add (L"");
 					continue;
 				}
-				arr.Last() += token.empty() ? L',' : token;
+				arr.Last() += token.empty() ? L"," : token;
 			}
 			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()
-				|| (wxString (volume->MountPoint) + wxFileName::GetPathSeparator()) == pathFilter.GetFullPath())
+			else if (wxString (wstring(volume->MountPoint)) == pathFilter.GetFullPath()
+				|| (wxString (wstring(volume->MountPoint)) + wxFileName::GetPathSeparator()) == pathFilter.GetFullPath())
 			{
 				filteredVolumes.push_back (volume);
 			}

diff --git a/Main/Forms/MainFrame.cpp b/Main/Forms/MainFrame.cpp
@@ -828,7 +828,7 @@ namespace TrueCrypt
 			// File-hosted volumes
 			if (!volume->Path.IsDevice() && !mountPoint.IsEmpty())
 			{
-				if (wxString (volume->Path).Upper().StartsWith (wstring (mountPoint).c_str()))
+				if (wxString (wstring(volume->Path)).Upper().StartsWith (wstring (mountPoint).c_str()))
 				{
 					removedVolumes.push_back (volume);
 					continue;

diff --git a/Main/Forms/SelectDirectoryWizardPage.cpp b/Main/Forms/SelectDirectoryWizardPage.cpp
@@ -16,7 +16,7 @@ namespace TrueCrypt
 	{
 		if (!DirectoryTextCtrl->IsEmpty())
 		{
-			return FilesystemPath (DirectoryTextCtrl->GetValue()).IsDirectory();
+			return FilesystemPath (wstring(DirectoryTextCtrl->GetValue())).IsDirectory();
 		}
 
 		return false;

diff --git a/Main/Forms/SelectDirectoryWizardPage.h b/Main/Forms/SelectDirectoryWizardPage.h
@@ -18,7 +18,7 @@ namespace TrueCrypt
 	public:
 		SelectDirectoryWizardPage (wxPanel* parent) : SelectDirectoryWizardPageBase (parent) { }
 
-		DirectoryPath GetDirectory () const { return DirectoryPath (DirectoryTextCtrl->GetValue()); }
+		DirectoryPath GetDirectory () const { return DirectoryPath (wstring(DirectoryTextCtrl->GetValue())); }
 		bool IsValid ();
 		void SetDirectory (const DirectoryPath &path) { DirectoryTextCtrl->SetValue (wstring (path)); }
 		void SetMaxStaticTextWidth (int width) { InfoStaticText->Wrap (width); }

diff --git a/Main/GraphicUserInterface.cpp b/Main/GraphicUserInterface.cpp
@@ -1250,19 +1250,19 @@ namespace TrueCrypt
 			File backupFile;
 			backupFile.Open (*files.front(), File::OpenRead);
 
-			uint64 headerSize;
+			//uint64 headerSize;
 			bool legacyBackup;
 
 			// Determine the format of the backup file
 			switch (backupFile.Length())
 			{
 			case TC_VOLUME_HEADER_GROUP_SIZE:
-				headerSize = TC_VOLUME_HEADER_SIZE;
+				//headerSize = TC_VOLUME_HEADER_SIZE;
 				legacyBackup = false;
 				break;
 
 			case TC_VOLUME_HEADER_SIZE_LEGACY * 2:
-				headerSize = TC_VOLUME_HEADER_SIZE_LEGACY;
+				//headerSize = TC_VOLUME_HEADER_SIZE_LEGACY;
 				legacyBackup = true;
 				break;
 
@@ -1378,13 +1378,14 @@ namespace TrueCrypt
 
 	DirectoryPath GraphicUserInterface::SelectDirectory (wxWindow *parent, const wxString &message, bool existingOnly) const
 	{
-		return DirectoryPath (::wxDirSelector (!message.empty() ? message :
+		return DirectoryPath (wstring(::wxDirSelector (!message.empty() ? message :
 #ifdef __WXGTK__
 			wxDirSelectorPromptStr,
 #else
 			L"",
 #endif
-			L"", wxDD_DEFAULT_STYLE | (existingOnly ? wxDD_DIR_MUST_EXIST : 0), wxDefaultPosition, parent));
+			L"", wxDD_DEFAULT_STYLE | (existingOnly ? wxDD_DIR_MUST_EXIST :
+                        0), wxDefaultPosition, parent)));
 	}
 
 	FilePathList GraphicUserInterface::SelectFiles (wxWindow *parent, const wxString &caption, bool saveMode, bool allowMultiple, const list < pair <wstring, wstring> > &fileExtensions, const DirectoryPath &directory) const
@@ -1428,14 +1429,14 @@ namespace TrueCrypt
 		if (dialog.ShowModal() == wxID_OK)
 		{
 			if (!allowMultiple)
-				files.push_back (make_shared <FilePath> (dialog.GetPath()));
+				files.push_back (make_shared <FilePath> (wstring(dialog.GetPath())));
 			else
 			{
 				wxArrayString paths;
 				dialog.GetPaths (paths);
 
 				foreach (const wxString &path, paths)
-					files.push_back (make_shared <FilePath> (path));
+					files.push_back (make_shared <FilePath> (wstring(path)));
 			}
 		}
 

diff --git a/Main/TextUserInterface.cpp b/Main/TextUserInterface.cpp
@@ -116,7 +116,7 @@ namespace TrueCrypt
 			for (size_t i = 0; i < length && i < VolumePassword::MaxSize; ++i)
 			{
 				passwordBuf[i] = (wchar_t) passwordStr[i];
-				const_cast <wchar_t *> (passwordStr.c_str())[i] = L'X';
+				const_cast <wchar_t *> (passwordStr.wc_str())[i] = L'X';
 			}
 
 			if (verify && verPhase)

diff --git a/Main/UserPreferences.cpp b/Main/UserPreferences.cpp
@@ -219,7 +219,7 @@ namespace TrueCrypt
 
 			foreach_ref (const Keyfile &keyfile, DefaultKeyfiles)
 			{
-				keyfilesXml.InnerNodes.push_back (XmlNode (L"keyfile", wxString (FilesystemPath (keyfile))));
+				keyfilesXml.InnerNodes.push_back (XmlNode (L"keyfile", wxString (wstring(FilesystemPath (keyfile)))));
 			}
 
 			XmlWriter keyfileWriter (keyfilesCfgPath);

diff --git a/Makefile b/Makefile
@@ -40,6 +40,7 @@ export CXXFLAGS := -Wall -Wno-unused-parameter
 C_CXX_FLAGS := -MMD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES -I$(BASE_DIR) -I$(BASE_DIR)/Crypto
 export ASFLAGS := -Ox -D __GNUC__
 export LFLAGS :=
+export LIBS := -ldl
 
 export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig
 

diff --git a/Mount/Mount.rc b/Mount/Mount.rc
@@ -1,14 +1,14 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "Resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "afxres.h"
-#include "..\\common\\resource.h"
+#include "..\\common\\Resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -27,7 +27,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // HEADER
 //
 
-IDR_MOUNT_RSRC_HEADER   HEADER                  "resource.h"
+IDR_MOUNT_RSRC_HEADER   HEADER                  "Resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -461,13 +461,13 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "Resource.h\0"
 END
 
 2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
-    "#include ""..\\\\common\\\\resource.h""\r\n"
+    "#include ""..\\\\common\\\\Resource.h""\r\n"
     "\0"
 END
 

diff --git a/Mount/Mount.vcproj b/Mount/Mount.vcproj
@@ -489,7 +489,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\resource.h"
+				RelativePath=".\Resource.h"
 				>
 			</File>
 			<File

diff --git a/Mount/resource.h → Mount/Resource.h b/Mount/resource.h → Mount/Resource.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -330,7 +330,7 @@ @@
     				>
     			</File>
     			<File
-    				RelativePath=".\resource.h"
+    				RelativePath=".\Resource.h"
     				>
     			</File>
     			<File
@@ Expand Down @@