--- truecrypt/common/common.h	2018/04/24 16:44:42	1.1.1.3
+++ truecrypt/common/common.h	2018/04/24 17:11:28	1.1.1.14
@@ -1,14 +1,50 @@
+/*
+ Copyright (c) 2005-2009 TrueCrypt Developers Association. All rights reserved.
+
+ Governed by the TrueCrypt License 3.0 the full text of which is contained in
+ the file License.txt included in TrueCrypt binary and source code distribution
+ packages.
+*/
+
 #ifndef COMMON_H
 #define COMMON_H
 
 #include "Crypto.h"
 
+#define MIN_MOUNTED_VOLUME_DRIVE_NUMBER ('A' - 'A')
+#define MAX_MOUNTED_VOLUME_DRIVE_NUMBER ('Z' - 'A')
+
+#define MAX_HOST_DRIVE_NUMBER 64
+#define MAX_HOST_PARTITION_NUMBER 32
+
+typedef enum
+{
+	// IMPORTANT: If you add a new item here, update IsOSVersionAtLeast().
+
+	WIN_UNKNOWN = 0,
+	WIN_31,
+	WIN_95,
+	WIN_98,
+	WIN_ME,
+	WIN_NT3,
+	WIN_NT4,
+	WIN_2000,
+	WIN_XP,
+	WIN_XP64,
+	WIN_SERVER_2003,
+	WIN_VISTA,
+	WIN_SERVER_2008,
+	WIN_7,
+	WIN_SERVER_2008_R2,
+} OSVersionEnum;
+
 /* Volume types */
 enum
 {
-	VOLUME_TYPE_NORMAL = 0,
-	VOLUME_TYPE_HIDDEN,
-	NBR_VOLUME_TYPES
+	TC_VOLUME_TYPE_NORMAL = 0,
+	TC_VOLUME_TYPE_HIDDEN,
+	TC_VOLUME_TYPE_HIDDEN_LEGACY,
+	TC_VOLUME_TYPE_COUNT
 };
 
 /* Prop volume types */
@@ -18,6 +54,7 @@ enum
 	PROP_VOL_TYPE_HIDDEN,
 	PROP_VOL_TYPE_OUTER,						/* Outer/normal (hidden volume protected) */
 	PROP_VOL_TYPE_OUTER_VOL_WRITE_PREVENTED,	/* Outer/normal (hidden volume protected AND write already prevented) */
+	PROP_VOL_TYPE_SYSTEM,
 	PROP_NBR_VOLUME_TYPES
 };
 
@@ -31,19 +68,14 @@ enum
 
 typedef struct
 {
-	int Length;
-	unsigned char Text[MAX_PASSWORD + 1];
-} Password;
-
-typedef struct
-{
 	BOOL ReadOnly;
 	BOOL Removable;
 	BOOL ProtectHiddenVolume;
 	BOOL PreserveTimestamp;
-	BOOL SystemVolume;
-	BOOL PersistentVolume;
+	BOOL PartitionInInactiveSysEncScope;	/* If TRUE, we are to attempt to mount a partition located on an encrypted system drive without pre-boot authentication. */
 	Password ProtectedHidVolPassword;	/* Password of hidden volume to protect against overwriting */
+	BOOL UseBackupHeader;
+	BOOL RecoveryMode;
 } MountOptions;
 
 #endif