Add original TrueCrypt 7.1a sources

2025-11-13 03:48:26 -06:00 · 2013-06-22 16:16:13 +02:00
commit c606f0866c
252 changed files with 96916 additions and 0 deletions
--- a/src/Format/Format.manifest
+++ b/src/Format/Format.manifest
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+</assembly>
--- a/src/Format/Format.rc
+++ b/src/Format/Format.rc
@@ -0,0 +1,698 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "..\\common\\resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 7,1,1,0
+ PRODUCTVERSION 7,1,1,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "TrueCrypt Foundation"
+            VALUE "FileDescription", "TrueCrypt Format"
+            VALUE "FileVersion", "7.1a"
+            VALUE "LegalTrademarks", "TrueCrypt"
+            VALUE "OriginalFilename", "TrueCrypt Format.exe"
+            VALUE "ProductName", "TrueCrypt"
+            VALUE "ProductVersion", "7.1a"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// HEADER
+//
+
+IDR_FORMAT_RSRC_HEADER  HEADER                  "resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// TYPELIB
+//
+
+IDR_FORMAT_TLB          TYPELIB                 "Format.tlb"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_VOL_CREATION_WIZARD_DLG DIALOGEX 0, 0, 400, 209
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "TrueCrypt Volume Creation Wizard"
+CLASS "CustomDlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    PUSHBUTTON      "&Help",IDHELP,176,189,50,14
+    PUSHBUTTON      "",IDC_PREV,235,189,50,14
+    DEFPUSHBUTTON   "",IDC_NEXT,285,189,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,343,189,50,14
+    LTEXT           "",IDC_BOX_TITLE,160,8,233,17
+    GROUPBOX        "",IDC_STATIC,4,0,392,183
+    CONTROL         116,IDC_BITMAP_WIZARD,"Static",SS_BITMAP | SS_SUNKEN,10,9,137,169
+    LTEXT           "",IDC_POS_BOX,160,24,231,152
+END
+
+IDD_CIPHER_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    COMBOBOX        IDC_COMBO_BOX,7,23,137,126,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Test",IDC_CIPHER_TEST,149,22,59,14
+    PUSHBUTTON      "&Benchmark",IDC_BENCHMARK,149,82,59,14
+    COMBOBOX        IDC_COMBO_BOX_HASH_ALGO,7,122,83,126,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "",IDC_BOX_HELP,7,40,205,40
+    GROUPBOX        "Encryption Algorithm",IDT_ENCRYPTION_ALGO,0,10,217,95
+    GROUPBOX        "Hash Algorithm",IDT_HASH_ALGO,0,109,217,35
+    LTEXT           "More information",IDC_LINK_MORE_INFO_ABOUT_CIPHER,7,82,135,10,SS_NOTIFY
+    LTEXT           "Information on hash algorithms",IDC_LINK_HASH_INFO,97,124,115,8,SS_NOTIFY
+END
+
+IDD_PASSWORD_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    EDITTEXT        IDC_PASSWORD,53,3,163,14,ES_PASSWORD | ES_AUTOHSCROLL
+    EDITTEXT        IDC_VERIFY,53,19,163,14,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,53,45,95,11,WS_EX_TRANSPARENT
+    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,53,35,95,10
+    PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,152,36,64,14,WS_DISABLED
+    RTEXT           "Password:",IDT_PASSWORD,1,6,50,8
+    RTEXT           "&Confirm:",IDT_CONFIRM,1,23,50,8
+    LTEXT           "",IDC_BOX_HELP,0,59,225,89
+END
+
+IDD_SIZE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    EDITTEXT        IDC_SIZEBOX,0,22,71,14,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "&KB",IDC_KB,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,80,25,38,10
+    CONTROL         "&MB",IDC_MB,"Button",BS_AUTORADIOBUTTON,119,25,38,10
+    CONTROL         "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,158,25,38,10
+    LTEXT           "",IDC_BOX_HELP,0,75,214,64
+    LTEXT           "",IDC_SPACE_LEFT,0,44,214,21
+END
+
+IDD_VOLUME_LOCATION_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    COMBOBOX        IDC_COMBO_BOX,0,9,148,80,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "&Never save history",IDC_NO_HISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,28,137,10
+    PUSHBUTTON      "",IDC_SELECT_VOLUME_LOCATION,155,9,62,14
+    LTEXT           "",IDC_BOX_HELP,0,45,219,104
+END
+
+IDD_FORMAT_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    COMBOBOX        IDC_FILESYS,43,13,36,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    COMBOBOX        IDC_CLUSTERSIZE,112,13,42,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    CONTROL         "Quick Format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,163,11,60,18
+    CONTROL         "",IDC_SHOW_KEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,214,38,9,8
+    PUSHBUTTON      "Abort",IDC_ABORT_BUTTON,169,75,50,14
+    RTEXT           "Header Key: ",IDT_HEADER_KEY,2,47,54,8
+    CONTROL         "",IDC_HEADER_KEY,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,57,46,163,8,WS_EX_TRANSPARENT
+    RTEXT           "Master Key: ",IDT_MASTER_KEY,2,55,54,8
+    LTEXT           "",IDC_DISK_KEY,57,54,163,8,0,WS_EX_TRANSPARENT
+    RTEXT           "Cluster ",IDT_CLUSTER,80,15,32,8
+    LTEXT           "",IDC_BOX_HELP,1,112,224,40
+    GROUPBOX        "Options",IDT_FORMAT_OPTIONS,0,3,225,29
+    CONTROL         "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,76,158,12
+    RTEXT           "",IDC_TIMEREMAIN,177,93,42,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "",IDC_WRITESPEED,106,93,42,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    LTEXT           "",IDC_BYTESWRITTEN,29,93,39,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "Done",IDT_DONE,5,94,22,8
+    RTEXT           "Speed",IDT_SPEED,70,94,34,8
+    RTEXT           "Left",IDT_LEFT,150,94,25,8
+    GROUPBOX        "",IDC_STATIC,0,67,225,41
+    RTEXT           "Filesystem ",IDT_FILESYSTEM,1,15,41,8,0,WS_EX_RIGHT
+    RTEXT           "Random Pool: ",IDT_RANDOM_POOL,2,39,54,8
+    GROUPBOX        "",IDC_STATIC,0,32,225,35
+    CONTROL         "",IDC_RANDOM_BYTES,"Static",SS_SIMPLE | WS_GROUP,57,38,155,8,WS_EX_TRANSPARENT
+END
+
+IDD_INTRO_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Create an encrypted file container",IDC_FILE_CONTAINER,
+                    "Button",BS_AUTORADIOBUTTON,0,7,217,10
+    LTEXT           "More information",IDC_MORE_INFO_ON_CONTAINERS,16,39,165,10,SS_NOTIFY
+    CONTROL         "Encrypt a non-system partition/drive",IDC_NONSYS_DEVICE,
+                    "Button",BS_AUTORADIOBUTTON,0,53,217,10
+    CONTROL         "Encrypt the system partition or entire system drive",IDC_SYS_DEVICE,
+                    "Button",BS_AUTORADIOBUTTON,0,87,217,10
+    LTEXT           "More information about system encryption",IDC_MORE_INFO_ON_SYS_ENCRYPTION,16,136,190,10,SS_NOTIFY
+    LTEXT           "Creates a virtual encrypted disk within a file. Recommended for inexperienced users.",IDT_FILE_CONTAINER,16,20,205,16
+    LTEXT           "Encrypts a non-system partition on any internal or external drive (e.g. a flash drive). Optionally, creates a hidden volume.",IDT_NON_SYS_DEVICE,16,66,205,16
+    LTEXT           "Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.",IDT_SYS_DEVICE,16,100,205,33
+END
+
+IDD_INFO_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "",IDC_BOX_HELP,0,10,225,137
+END
+
+IDD_HIDVOL_HOST_FILL_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "",IDC_BOX_HELP,0,6,226,130
+    PUSHBUTTON      "Open Outer Volume",IDC_OPEN_OUTER_VOLUME,0,136,85,14
+END
+
+IDD_HIDDEN_VOL_WIZARD_MODE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Normal mode",IDC_HIDVOL_WIZ_MODE_FULL,"Button",BS_AUTORADIOBUTTON,0,7,217,10
+    CONTROL         "Direct mode",IDC_HIDVOL_WIZ_MODE_DIRECT,"Button",BS_AUTORADIOBUTTON,0,76,217,10
+    LTEXT           "",IDC_BOX_HELP,16,20,205,48
+    LTEXT           "",IDC_BOX_HELP2,16,89,205,50
+END
+
+IDD_PASSWORD_ENTRY_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    EDITTEXT        IDC_PASSWORD_DIRECT,50,11,149,14,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "&Display password",IDC_SHOW_PASSWORD_SINGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,27,84,11,WS_EX_TRANSPARENT
+    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,38,82,11
+    PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,135,29,64,14
+    LTEXT           "",IDC_BOX_HELP,0,57,225,94
+    RTEXT           "Password:",IDT_PASSWORD,0,15,48,8
+END
+
+IDD_VOLUME_TYPE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Standard TrueCrypt volume",IDC_STD_VOL,"Button",BS_AUTORADIOBUTTON,0,7,212,10
+    CONTROL         "Hi&dden TrueCrypt volume ",IDC_HIDDEN_VOL,"Button",BS_AUTORADIOBUTTON,0,53,212,10
+    LTEXT           "More information about hidden volumes",IDC_HIDDEN_VOL_HELP,16,125,205,10,SS_NOTIFY
+    LTEXT           "",IDC_BOX_HELP_NORMAL_VOL,16,20,205,25
+    LTEXT           "",IDC_BOX_HELP,16,66,205,57
+END
+
+IDD_SYSENC_SPAN_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Encrypt the Windows system partition",IDC_SYS_PARTITION,
+                    "Button",BS_AUTORADIOBUTTON,0,7,212,10
+    CONTROL         "Encrypt the whole drive",IDC_WHOLE_SYS_DRIVE,"Button",BS_AUTORADIOBUTTON,0,53,212,10
+    LTEXT           "Select this option to encrypt the partition where the currently running Windows operating system is installed.",IDT_SYS_PARTITION,16,20,205,32
+    LTEXT           "",IDT_WHOLE_SYS_DRIVE,16,66,205,79
+END
+
+IDD_SYSENC_RESCUE_DISK_CREATION_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    EDITTEXT        IDC_RESCUE_DISK_ISO_PATH,0,135,163,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "Bro&wse...",IDC_BROWSE,166,134,59,14
+    LTEXT           "",IDT_RESCUE_DISK_INFO,0,1,225,129
+END
+
+IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    CONTROL         "Display pool content",IDC_DISPLAY_POOL_CONTENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,1,98,122,10
+    CONTROL         "",IDC_SYS_POOL_CONTENTS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,8,14,205,72,WS_EX_TRANSPARENT
+    LTEXT           "IMPORTANT: Move your mouse as randomly as possible within this window. The longer you move it, the better. This significantly increases the cryptographic strength of the encryption keys. Then click Next to continue.",IDT_COLLECTING_RANDOM_DATA_NOTE,1,112,224,40
+    GROUPBOX        "Current pool content (partial)",IDT_PARTIAL_POOL_CONTENTS,0,5,222,88
+END
+
+IDD_SYSENC_MULTI_BOOT_MODE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Single-boot",IDC_SINGLE_BOOT,"Button",BS_AUTORADIOBUTTON,0,7,212,10
+    CONTROL         "Multi-boot",IDC_MULTI_BOOT,"Button",BS_AUTORADIOBUTTON,0,53,217,10
+    LTEXT           "Select this option if there is only one operating system installed on this computer (even if it has multiple users).",IDT_SINGLE_BOOT,16,20,205,32
+    LTEXT           "Select this option if there are two or more operating systems installed on this computer.\n\nFor example:\n- Windows XP and Windows XP\n- Windows XP and Windows Vista\n- Windows and Mac OS X\n- Windows and Linux\n- Windows, Linux and Mac OS X",IDT_MULTI_BOOT,16,66,205,72
+END
+
+IDD_SYSENC_RESCUE_DISK_BURN_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "Download CD/DVD recording software",IDC_DOWNLOAD_CD_BURN_SOFTWARE,0,136,217,10,SS_NOTIFY
+    LTEXT           "",IDT_RESCUE_DISK_BURN_INFO,0,4,225,128
+END
+
+IDD_SYSENC_WIPE_MODE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    COMBOBOX        IDC_WIPE_MODE,61,0,127,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    RTEXT           "Wipe mode:",IDT_WIPE_MODE,0,2,59,8,0,WS_EX_RIGHT
+    LTEXT           "",IDT_WIPE_MODE_INFO,0,19,225,128
+END
+
+IDD_INPLACE_ENCRYPTION_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    COMBOBOX        IDC_WIPE_MODE,67,13,125,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    PUSHBUTTON      "&Pause",IDC_PAUSE,169,40,50,14
+    LTEXT           "More information",IDC_MORE_INFO_SYS_ENCRYPTION,1,141,202,10,SS_NOTIFY
+    LTEXT           "",IDC_BYTESWRITTEN,29,58,39,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "",IDC_WRITESPEED,103,58,46,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "",IDC_TIMEREMAIN,177,58,42,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "Wipe mode:",IDT_WIPE_MODE,6,15,59,8,0,WS_EX_RIGHT
+    CONTROL         "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,41,158,12
+    RTEXT           "Done",IDT_DONE,5,59,22,8
+    RTEXT           "Status",IDT_STATUS,72,59,29,8
+    RTEXT           "Left",IDT_LEFT,151,59,24,8
+    LTEXT           "",IDC_BOX_HELP,1,77,224,64
+    GROUPBOX        "Options",IDT_FORMAT_OPTIONS,0,3,225,29
+    GROUPBOX        "",IDC_STATIC,0,32,225,41
+END
+
+IDD_SYSENC_KEYS_GEN_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    CONTROL         "Display generated keys (their portions)",IDC_DISPLAY_KEYS,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,1,94,216,10
+    CONTROL         "",IDC_HEADER_KEY,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,57,71,163,8,WS_EX_TRANSPARENT
+    LTEXT           "",IDC_DISK_KEY,57,79,163,8,0,WS_EX_TRANSPARENT
+    LTEXT           "The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.",IDT_SYSENC_KEYS_GEN_INFO,1,23,224,41
+    RTEXT           "Header Key: ",IDT_HEADER_KEY,2,72,54,8
+    RTEXT           "Master Key: ",IDT_MASTER_KEY,2,80,54,8
+    GROUPBOX        "",-1,0,65,225,26
+END
+
+IDD_UNIVERSAL_DUAL_CHOICE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "",IDC_CHOICE1,"Button",BS_AUTORADIOBUTTON,0,7,212,10
+    CONTROL         "",IDC_CHOICE2,"Button",BS_AUTORADIOBUTTON,0,17,217,10
+    LTEXT           "",IDC_BOX_HELP,1,34,220,112
+END
+
+IDD_SYSENC_DRIVE_ANALYSIS_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "",IDT_SYSENC_DRIVE_ANALYSIS_INFO,2,10,215,88
+    CONTROL         "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,1,115,216,12
+    LTEXT           "Progress:",IDT_PROGRESS,2,104,57,8
+END
+
+IDD_SYSENC_TYPE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Normal",IDC_SYSENC_NORMAL,"Button",BS_AUTORADIOBUTTON,0,7,212,10
+    CONTROL         "Hi&dden",IDC_SYSENC_HIDDEN,"Button",BS_AUTORADIOBUTTON,0,53,212,10
+    LTEXT           "More information",IDC_HIDDEN_SYSENC_INFO_LINK,16,138,205,10,SS_NOTIFY
+    LTEXT           "",IDC_BOX_HELP_SYSENC_NORMAL,16,20,205,25
+    LTEXT           "",IDC_BOX_HELP,16,66,205,72
+END
+
+IDD_SYSENC_HIDDEN_OS_REQ_CHECK_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "More information",IDC_HIDDEN_SYSENC_INFO_LINK,0,141,217,10,SS_NOTIFY
+    LTEXT           "",IDC_BOX_HELP,0,2,225,136
+END
+
+IDD_DEVICE_WIPE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    PUSHBUTTON      "Abort",IDC_ABORT_BUTTON,169,48,50,14
+    LTEXT           "",IDC_BYTESWRITTEN,29,66,39,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "",IDC_WRITESPEED,103,66,46,11,SS_CENTERIMAGE | NOT WS_VISIBLE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "",IDC_TIMEREMAIN,177,66,42,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "Wipe mode:",IDT_WIPE_MODE,6,22,59,8,0,WS_EX_RIGHT
+    CONTROL         "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,49,158,12
+    RTEXT           "Done",IDT_DONE,5,67,22,8
+    RTEXT           "Pass",IDT_PASS,72,67,29,8,NOT WS_VISIBLE
+    RTEXT           "Left",IDT_LEFT,151,67,24,8
+    LTEXT           "",IDC_BOX_HELP,1,86,224,64
+    GROUPBOX        "",IDT_FORMAT_OPTIONS,0,10,225,29
+    GROUPBOX        "",IDC_STATIC,0,40,225,42
+    LTEXT           "",IDC_WIPE_MODE,67,21,125,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
+END
+
+IDD_DEVICE_WIPE_MODE_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    COMBOBOX        IDC_WIPE_MODE,61,9,127,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    RTEXT           "Wipe mode:",IDT_WIPE_MODE,0,11,59,8,0,WS_EX_RIGHT
+    LTEXT           "",IDT_WIPE_MODE_INFO,0,29,225,122
+END
+
+IDD_DEVICE_TRANSFORM_MODE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Create encrypted volume and format it",IDC_DEVICE_TRANSFORM_MODE_FORMAT,
+                    "Button",BS_AUTORADIOBUTTON,0,8,217,10
+    CONTROL         "Encrypt partition in place",IDC_DEVICE_TRANSFORM_MODE_INPLACE,
+                    "Button",BS_AUTORADIOBUTTON,0,98,217,10
+    LTEXT           "",IDC_BOX_HELP,16,21,205,74
+    LTEXT           "",IDC_BOX_HELP2,16,111,205,34
+END
+
+IDD_EXPANDED_LIST_SELECT_PAGE_DLG DIALOGEX 0, 0, 226, 152
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "",IDC_BOX_HELP,0,107,225,41
+    LISTBOX         IDC_LIST_BOX,0,3,222,100,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""..\\\\common\\\\resource.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "#include ""..\\\\common\\\\common.rc""\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_VOL_CREATION_WIZARD_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 393
+        TOPMARGIN, 1
+        BOTTOMMARGIN, 207
+        HORZGUIDE, 196
+    END
+
+    IDD_CIPHER_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 141
+    END
+
+    IDD_PASSWORD_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 123
+    END
+
+    IDD_SIZE_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_VOLUME_LOCATION_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 147
+    END
+
+    IDD_FORMAT_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 217
+        BOTTOMMARGIN, 133
+        HORZGUIDE, 80
+        HORZGUIDE, 96
+    END
+
+    IDD_INTRO_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_INFO_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_HIDVOL_HOST_FILL_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_HIDDEN_VOL_WIZARD_MODE_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_PASSWORD_ENTRY_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 123
+    END
+
+    IDD_VOLUME_TYPE_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_SYSENC_SPAN_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_SYSENC_RESCUE_DISK_CREATION_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 147
+    END
+
+    IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 217
+        BOTTOMMARGIN, 133
+        HORZGUIDE, 80
+        HORZGUIDE, 96
+    END
+
+    IDD_SYSENC_MULTI_BOOT_MODE_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_SYSENC_RESCUE_DISK_BURN_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 147
+    END
+
+    IDD_SYSENC_WIPE_MODE_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_INPLACE_ENCRYPTION_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 217
+        BOTTOMMARGIN, 133
+        HORZGUIDE, 80
+        HORZGUIDE, 96
+    END
+
+    IDD_SYSENC_KEYS_GEN_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 217
+        BOTTOMMARGIN, 133
+        HORZGUIDE, 80
+        HORZGUIDE, 96
+    END
+
+    IDD_UNIVERSAL_DUAL_CHOICE_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_SYSENC_DRIVE_ANALYSIS_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 217
+        BOTTOMMARGIN, 133
+        HORZGUIDE, 80
+        HORZGUIDE, 96
+    END
+
+    IDD_SYSENC_TYPE_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_SYSENC_HIDDEN_OS_REQ_CHECK_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 223
+        BOTTOMMARGIN, 147
+    END
+
+    IDD_DEVICE_WIPE_PAGE_DLG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 217
+        BOTTOMMARGIN, 133
+        HORZGUIDE, 80
+        HORZGUIDE, 96
+    END
+
+    IDD_DEVICE_WIPE_MODE_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_DEVICE_TRANSFORM_MODE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+
+    IDD_EXPANDED_LIST_SELECT_PAGE_DLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 145
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_WIZARD              BITMAP                  "TrueCrypt_wizard.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_UACSTRING_FMT       "TrueCrypt"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#include "..\\common\\common.rc"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
--- a/src/Format/Format.vcproj
+++ b/src/Format/Format.vcproj
@@ -0,0 +1,682 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="Format"
+	ProjectGUID="{9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}"
+	RootNamespace="Format"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				PreprocessorDefinitions="VOLFORMAT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4057;4100;4127;4201;4204;4701;4706"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib setupapi.lib ..\Crypto\Debug\crypto.lib"
+				OutputFile="$(OutDir)/TrueCryptFormat.exe"
+				LinkIncremental="2"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/Format.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="Format.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="md &quot;..\Debug\Setup Files&quot; 2&gt;NUL:&#x0D;&#x0A;copy Debug\TrueCryptFormat.exe &quot;..\Debug\Setup Files\TrueCrypt Format.exe&quot; &gt;NUL:&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/w34189"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				PreprocessorDefinitions="VOLFORMAT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)/"
+				WarningLevel="4"
+				DebugInformationFormat="0"
+				DisableSpecificWarnings="4057;4100;4127;4201;4204;4701;4706"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib setupapi.lib ..\Crypto\Release\crypto.lib"
+				OutputFile="$(OutDir)/TrueCryptFormat.exe"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="false"
+				GenerateDebugInformation="false"
+				GenerateMapFile="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				AdditionalManifestFiles="Format.manifest"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy Release\TrueCryptFormat.exe &quot;..\Release\Setup Files\TrueCrypt Format.exe&quot;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\FormatCom.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FormatCom.idl"
+				>
+			</File>
+			<File
+				RelativePath=".\InPlace.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\Tcformat.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<Filter
+				Name="Common"
+				>
+				<File
+					RelativePath="..\Common\BaseCom.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\BootEncryption.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Cmdline.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Combo.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Crc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Crypto.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Dictionary.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\Common\Dlgcode.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\Common\EncryptionThreadPool.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Endian.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Fat.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Format.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\GfMul.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Keyfiles.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\Common\Language.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Password.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Pkcs5.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Progress.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Random.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Registry.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\SecurityToken.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Tests.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Volumes.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Wipe.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Xml.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Xts.c"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\Common\BaseCom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Crc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Crypto.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Dictionary.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Dlgcode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\EncryptionThreadPool.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Endian.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Exception.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Fat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Format.h"
+				>
+			</File>
+			<File
+				RelativePath=".\FormatCom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\GfMul.h"
+				>
+			</File>
+			<File
+				RelativePath=".\InPlace.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Keyfiles.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Language.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Mount\Mount.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Pkcs5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Progress.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Random.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Registry.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\SecurityToken.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Tcdefs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Tcformat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Tests.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Volumes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Wipe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Xml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\Xts.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\Format.manifest"
+				>
+			</File>
+			<File
+				RelativePath=".\Format.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\Format.tlb"
+				SubType="Designer"
+				>
+			</File>
+			<File
+				RelativePath="..\Common\TrueCrypt_Volume.ico"
+				>
+			</File>
+			<File
+				RelativePath=".\TrueCrypt_wizard.bmp"
+				>
+			</File>
+			<Filter
+				Name="Common"
+				>
+				<File
+					RelativePath="..\Boot\Windows\Rescue_AES\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Rescue\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Rescue_Twofish\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release_Serpent\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release_AES\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release_Twofish\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Rescue_Serpent\BootLoader.com.gz"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Rescue_AES\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Rescue\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release_Serpent\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Rescue_Serpent\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Rescue_Twofish\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release_Twofish\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release_AES\BootSector.bin"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Common.rc"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCResourceCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCResourceCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\Boot\Windows\Release\Decompressor.com"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Language.xml"
+					>
+				</File>
+				<File
+					RelativePath="..\Resources\Texts\License.rtf"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Textual_logo_288dpi.bmp"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Textual_logo_96dpi.bmp"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\Textual_logo_background.bmp"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\TrueCrypt.ico"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/src/Format/FormatCom.cpp
+++ b/src/Format/FormatCom.cpp
@@ -0,0 +1,222 @@
+/*
+ Copyright (c) 2007-2008 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.
+*/
+
+#include <atlcomcli.h>
+#include <atlconv.h>
+#include <comutil.h>
+#include <windows.h>
+#include "BaseCom.h"
+#include "BootEncryption.h"
+#include "Dlgcode.h"
+#include "Format.h"
+#include "Progress.h"
+#include "TcFormat.h"
+#include "FormatCom.h"
+#include "FormatCom_h.h"
+#include "FormatCom_i.c"
+
+using namespace TrueCrypt;
+
+static volatile LONG ObjectCount = 0;
+
+class TrueCryptFormatCom : public ITrueCryptFormatCom
+{
+
+public:
+	TrueCryptFormatCom (DWORD messageThreadId) : RefCount (0),
+		MessageThreadId (messageThreadId),
+		CallBack (NULL)
+	{
+		InterlockedIncrement (&ObjectCount);
+	}
+
+	~TrueCryptFormatCom ()
+	{
+		if (InterlockedDecrement (&ObjectCount) == 0)
+			PostThreadMessage (MessageThreadId, WM_APP, 0, 0);
+	}
+
+	virtual ULONG STDMETHODCALLTYPE AddRef ()
+	{
+		return InterlockedIncrement (&RefCount);
+	}
+
+	virtual ULONG STDMETHODCALLTYPE Release ()
+	{
+		if (!InterlockedDecrement (&RefCount))
+		{
+			delete this;
+			return 0;
+		}
+
+		return RefCount;
+	}
+
+	virtual HRESULT STDMETHODCALLTYPE QueryInterface (REFIID riid, void **ppvObject)
+	{
+		if (riid == IID_IUnknown || riid == IID_ITrueCryptFormatCom)
+			*ppvObject = this;
+		else
+		{
+			*ppvObject = NULL;
+			return E_NOINTERFACE;
+		}
+
+		AddRef ();
+		return S_OK;
+	}
+	
+	virtual DWORD STDMETHODCALLTYPE CallDriver (DWORD ioctl, BSTR input, BSTR *output)
+	{
+		return BaseCom::CallDriver (ioctl, input, output);
+	}
+
+	virtual DWORD STDMETHODCALLTYPE CopyFile (BSTR sourceFile, BSTR destinationFile)
+	{
+		return BaseCom::CopyFile (sourceFile, destinationFile);
+	}
+
+	virtual DWORD STDMETHODCALLTYPE DeleteFile (BSTR file)
+	{
+		return BaseCom::DeleteFile (file);
+	}
+
+	virtual BOOL STDMETHODCALLTYPE FormatNtfs (int driveNo, int clusterSize)
+	{
+		return ::FormatNtfs (driveNo, clusterSize);
+	}
+
+	virtual int STDMETHODCALLTYPE AnalyzeHiddenVolumeHost (
+		LONG_PTR hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters)
+	{
+		return ::AnalyzeHiddenVolumeHost (
+			(HWND) hwndDlg, driveNo, hiddenVolHostSize, realClusterSize, nbrFreeClusters);
+	}
+
+	virtual DWORD STDMETHODCALLTYPE ReadWriteFile (BOOL write, BOOL device, BSTR filePath, BSTR *bufferBstr, unsigned __int64 offset, unsigned __int32 size, DWORD *sizeDone)
+	{
+		return BaseCom::ReadWriteFile (write, device, filePath, bufferBstr, offset, size, sizeDone);
+	}
+
+	virtual DWORD STDMETHODCALLTYPE RegisterFilterDriver (BOOL registerDriver, int filterType)
+	{
+		return BaseCom::RegisterFilterDriver (registerDriver, filterType);
+	}
+
+	virtual DWORD STDMETHODCALLTYPE RegisterSystemFavoritesService (BOOL registerService)
+	{
+		return BaseCom::RegisterSystemFavoritesService (registerService);
+	}
+
+	virtual DWORD STDMETHODCALLTYPE SetDriverServiceStartType (DWORD startType)
+	{
+		return BaseCom::SetDriverServiceStartType (startType);
+	}
+
+	virtual BOOL STDMETHODCALLTYPE IsPagingFileActive (BOOL checkNonWindowsPartitionsOnly)
+	{
+		return BaseCom::IsPagingFileActive (checkNonWindowsPartitionsOnly);
+	}
+
+	virtual DWORD STDMETHODCALLTYPE WriteLocalMachineRegistryDwordValue (BSTR keyPath, BSTR valueName, DWORD value)
+	{
+		return BaseCom::WriteLocalMachineRegistryDwordValue (keyPath, valueName, value);
+	}
+
+protected:
+	DWORD MessageThreadId;
+	LONG RefCount;
+	ITrueCryptFormatCom *CallBack;
+};
+
+
+extern "C" BOOL ComServerFormat ()
+{
+	SetProcessShutdownParameters (0x100, 0);
+
+	TrueCryptFactory<TrueCryptFormatCom> factory (GetCurrentThreadId ());
+	DWORD cookie;
+
+	if (IsUacSupported ())
+		UacElevated = TRUE;
+
+	if (CoRegisterClassObject (CLSID_TrueCryptFormatCom, (LPUNKNOWN) &factory,
+		CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie) != S_OK)
+		return FALSE;
+
+	MSG msg;
+	while (int r = GetMessage (&msg, NULL, 0, 0))
+	{
+		if (r == -1)
+			return FALSE;
+
+		TranslateMessage (&msg);
+		DispatchMessage (&msg);
+
+		if (msg.message == WM_APP
+			&& ObjectCount < 1
+			&& !factory.IsServerLocked ())
+			break;
+	}
+	CoRevokeClassObject (cookie);
+
+	return TRUE;
+}
+
+
+static BOOL ComGetInstance (HWND hWnd, ITrueCryptFormatCom **tcServer)
+{
+	return ComGetInstanceBase (hWnd, CLSID_TrueCryptFormatCom, IID_ITrueCryptFormatCom, (void **) tcServer);
+}
+
+
+ITrueCryptFormatCom *GetElevatedInstance (HWND parent)
+{
+	ITrueCryptFormatCom *instance;
+
+	if (!ComGetInstance (parent, &instance))
+		throw UserAbort (SRC_POS);
+
+	return instance;
+}
+
+
+extern "C" int UacFormatNtfs (HWND hWnd, int driveNo, int clusterSize)
+{
+	CComPtr<ITrueCryptFormatCom> tc;
+	int r;
+
+	CoInitialize (NULL);
+
+	if (ComGetInstance (hWnd, &tc))
+		r = tc->FormatNtfs (driveNo, clusterSize);
+	else
+		r = 0;
+
+	CoUninitialize ();
+
+	return r;
+}
+
+
+extern "C" int UacAnalyzeHiddenVolumeHost (HWND hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters)
+{
+	CComPtr<ITrueCryptFormatCom> tc;
+	int r;
+
+	CoInitialize (NULL);
+
+	if (ComGetInstance (hwndDlg, &tc))
+		r = tc->AnalyzeHiddenVolumeHost ((LONG_PTR) hwndDlg, driveNo, hiddenVolHostSize, realClusterSize, nbrFreeClusters);
+	else
+		r = 0;
+
+	CoUninitialize ();
+
+	return r;
+}
--- a/src/Format/FormatCom.h
+++ b/src/Format/FormatCom.h
@@ -0,0 +1,32 @@
+/*
+ Copyright (c) 2007-2008 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 TC_HEADER_FORMAT_COM
+#define TC_HEADER_FORMAT_COM
+
+#include <windows.h>
+
+#ifdef __cplusplus
+
+#include "FormatCom_h.h"
+ITrueCryptFormatCom *GetElevatedInstance (HWND parent);
+
+extern "C" {
+#endif
+
+BOOL ComServerFormat ();
+int UacFormatNtfs (HWND hWnd, int driveNo, int clusterSize);
+int UacAnalyzeHiddenVolumeHost (HWND hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters);
+int UacFormatVolume (char *cvolumePath , BOOL bDevice , unsigned __int64 size , unsigned __int64 hiddenVolHostSize , Password *password , int cipher , int pkcs5 , BOOL quickFormat, BOOL sparseFileSwitch, int fileSystem , int clusterSize, HWND hwndDlg , BOOL hiddenVol , int *realClusterSize);
+BOOL UacUpdateProgressBar (__int64 nSecNo, BOOL *bVolTransformThreadCancel);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TC_HEADER_FORMAT_COM
--- a/src/Format/FormatCom.idl
+++ b/src/Format/FormatCom.idl
@@ -0,0 +1,48 @@
+/*
+ Copyright (c) 2007-2010 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.
+*/
+
+import "wtypes.idl";
+import "..\Common\Password.h";
+
+[
+	uuid(A7DF958C-0716-49E9-8C3E-53A775797576),
+	helpstring("TrueCrypt Format UAC Support Library"),
+	version(2.4)	// Update ComSetup.cpp when changing version number
+]
+library TrueCryptFormatCom
+{
+	[
+		uuid(9EE02955-174A-48F1-820C-022F327BE109),
+		object,
+		oleautomation,
+		helpstring("TrueCrypt Format UAC Support Interface")
+	]
+	interface ITrueCryptFormatCom : IUnknown
+	{
+		int AnalyzeHiddenVolumeHost (LONG_PTR hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters);
+		DWORD CallDriver (DWORD ioctl, BSTR input, BSTR *output);
+		DWORD CopyFile (BSTR sourceFile, BSTR destinationFile);
+		DWORD DeleteFile (BSTR file);
+		BOOL FormatNtfs (int driveNo, int clusterSize);
+		BOOL IsPagingFileActive (BOOL checkNonWindowsPartitionsOnly);
+		DWORD ReadWriteFile (BOOL write, BOOL device, BSTR filePath, BSTR *bufferBstr, unsigned __int64 offset, unsigned __int32 size, DWORD *sizeDone);
+		DWORD RegisterFilterDriver (BOOL registerDriver, int filterType);
+		DWORD RegisterSystemFavoritesService (BOOL registerService);
+		DWORD SetDriverServiceStartType (DWORD startType);
+		DWORD WriteLocalMachineRegistryDwordValue (BSTR keyPath, BSTR valueName, DWORD value);
+	};
+
+	[
+		uuid(777DCDFD-C330-480B-B582-B02B57580CC9),
+		helpstring("TrueCrypt Format UAC Support Coclass")
+	]
+	coclass TrueCryptFormatCom
+	{
+		[default] interface ITrueCryptFormatCom;
+	}
+}
--- a/src/Format/InPlace.c
+++ b/src/Format/InPlace.c
--- a/src/Format/InPlace.h
+++ b/src/Format/InPlace.h
@@ -0,0 +1,45 @@
+/*
+ Copyright (c) 2008-2010 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.
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "Format.h"
+
+enum nonsys_inplace_enc_status
+{
+	NONSYS_INPLACE_ENC_STATUS_NONE = 0,
+	NONSYS_INPLACE_ENC_STATUS_PREPARING,
+	NONSYS_INPLACE_ENC_STATUS_RESIZING,
+	NONSYS_INPLACE_ENC_STATUS_ENCRYPTING,
+	NONSYS_INPLACE_ENC_STATUS_FINALIZING,
+	NONSYS_INPLACE_ENC_STATUS_PAUSED,
+	NONSYS_INPLACE_ENC_STATUS_FINISHED,
+	NONSYS_INPLACE_ENC_STATUS_ERROR
+};
+
+BOOL CheckRequirementsForNonSysInPlaceEnc (const char *devicePath, BOOL silent);
+int EncryptPartitionInPlaceBegin (volatile FORMAT_VOL_PARAMETERS *volParams, volatile HANDLE *outHandle, WipeAlgorithmId wipeAlgorithm);
+int EncryptPartitionInPlaceResume (HANDLE dev, volatile FORMAT_VOL_PARAMETERS *volParams, WipeAlgorithmId wipeAlgorithm, volatile BOOL *bTryToCorrectReadErrors);
+void ShowInPlaceEncErrMsgWAltSteps (char *iniStrId, BOOL bErr);
+void SetNonSysInplaceEncUIStatus (int nonSysInplaceEncStatus);
+int FastVolumeHeaderUpdate (HANDLE dev, CRYPTO_INFO *headerCryptoInfo, CRYPTO_INFO *masterCryptoInfo, __int64 deviceSize);
+
+static HANDLE OpenPartitionVolume (const char *devName, BOOL bExclusiveRequired, BOOL bSharedRequired, BOOL bSharedRequiresConfirmation, BOOL bShowAlternativeSteps, BOOL bSilent);
+static int DismountFileSystem (HANDLE dev, int driveLetter, BOOL bForcedAllowed, BOOL bForcedRequiresConfirmation, BOOL bSilent);
+static int ConcealNTFS (HANDLE dev);
+BOOL SaveNonSysInPlaceEncSettings (int delta, WipeAlgorithmId wipeAlgorithm);
+static void ExportProgressStats (__int64 bytesDone, __int64 totalSize);
+int ZeroUnreadableSectors (HANDLE dev, LARGE_INTEGER startOffset, int64 size, int sectorSize, uint64 *zeroedSectorCount);
+static int OpenBackupHeader (HANDLE dev, const char *devicePath, Password *password, PCRYPTO_INFO *retCryptoInfo, CRYPTO_INFO *headerCryptoInfo, __int64 deviceSize);
+BOOL MoveClustersBeforeThreshold (HANDLE volumeHandle, PWSTR volumeDevicePath, int64 clusterThreshold);
+
+#ifdef __cplusplus
+}
+#endif
--- a/src/Format/Resource.h
+++ b/src/Format/Resource.h
@@ -0,0 +1,151 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Format.rc
+//
+#define IDR_FORMAT_TLB                  1
+#define IDD_VOL_CREATION_WIZARD_DLG     101
+#define IDD_CIPHER_PAGE_DLG             102
+#define IDD_SIZE_PAGE_DLG               103
+#define IDD_PASSWORD_PAGE_DLG           104
+#define IDD_VOLUME_LOCATION_PAGE_DLG    105
+#define IDD_FORMAT_PAGE_DLG             106
+#define IDD_INTRO_PAGE_DLG              107
+#define IDD_INFO_PAGE_DLG               108
+#define IDD_HIDVOL_HOST_FILL_PAGE_DLG   109
+#define IDD_HIDDEN_VOL_WIZARD_MODE_PAGE_DLG 110
+#define IDD_PASSWORD_ENTRY_PAGE_DLG     111
+#define IDS_UACSTRING_FMT               112
+#define IDD_VOLUME_TYPE_PAGE_DLG        113
+#define IDR_FORMAT_RSRC_HEADER          114
+#define IDD_SYSENC_SPAN_PAGE_DLG        115
+#define IDB_WIZARD                      116
+#define IDD_SYSENC_RESCUE_DISK_CREATION_DLG 117
+#define IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG 118
+#define IDD_SYSENC_MULTI_BOOT_MODE_PAGE_DLG 119
+#define IDD_SYSENC_RESCUE_DISK_BURN_PAGE_DLG 120
+#define IDD_SYSENC_WIPE_MODE_PAGE_DLG   121
+#define IDD_INPLACE_ENCRYPTION_PAGE_DLG 122
+#define IDD_SYSENC_KEYS_GEN_PAGE_DLG    123
+#define IDD_UNIVERSAL_DUAL_CHOICE_PAGE_DLG 124
+#define IDD_SYSENC_DRIVE_ANALYSIS_PAGE_DLG 125
+#define IDD_SYSENC_TYPE_PAGE_DLG        126
+#define IDD_SYSENC_HIDDEN_OS_REQ_CHECK_PAGE_DLG 127
+#define IDD_DEVICE_WIPE_PAGE_DLG        128
+#define IDD_DEVICE_WIPE_MODE_PAGE_DLG   129
+#define IDD_DEVICE_TRANSFORM_MODE_DLG   130
+#define IDD_EXPANDED_LIST_SELECT_PAGE_DLG 131
+#define IDC_BOX_TITLE                   1000
+#define IDC_RESCUE_DISK_ISO_PATH        1001
+#define IDC_COMBO_BOX                   1002
+#define IDC_BOX_HELP                    1003
+#define IDC_PASSWORD                    1004
+#define IDC_BROWSE                      1005
+#define IDC_BOX_HELP2                   1006
+#define IDC_COMBO_BOX_HASH              1007
+#define IDC_COMBO_BOX_HASH_ALGO         1008
+#define IDC_SPACE_LEFT                  1009
+#define IDC_VERIFY                      1010
+#define IDC_KB                          1011
+#define IDC_NO_HISTORY                  1012
+#define IDC_MB                          1013
+#define IDC_PROGRESS_BAR                1014
+#define IDC_GB                          1015
+#define IDC_ABORT_BUTTON                1016
+#define IDC_HEADER_KEY                  1017
+#define IDC_LIST_BOX                    1018
+#define IDC_DISK_KEY                    1019
+#define IDC_RANDOM_BYTES                1020
+#define IDC_CIPHER_TEST                 1021
+#define IDC_BENCHMARK                   1022
+#define IDC_QUICKFORMAT                 1023
+#define IDC_BYTESWRITTEN                1024
+#define IDC_WRITESPEED                  1025
+#define IDC_KEY_FILES                   1026
+#define IDC_TIMEREMAIN                  1027
+#define IDC_CLUSTERSIZE                 1028
+#define IDC_FILESYS                     1029
+#define IDC_SHOW_KEYS                   1030
+#define IDC_STD_VOL                     1031
+#define IDC_HIDDEN_VOL                  1032
+#define IDC_HIDDEN_VOL_HELP             1033
+#define IDC_OPEN_OUTER_VOLUME           1034
+#define IDC_HIDVOL_WIZ_MODE_FULL        1035
+#define IDC_HIDVOL_WIZ_MODE_DIRECT      1036
+#define IDC_PASSWORD_DIRECT             1037
+#define IDC_SIZEBOX                     1038
+#define IDC_SELECT_VOLUME_LOCATION      1039
+#define IDC_NEXT                        1040
+#define IDC_PREV                        1041
+#define IDT_ENCRYPTION_ALGO             1042
+#define IDT_HASH_ALGO                   1043
+#define IDT_FORMAT_OPTIONS              1044
+#define IDT_FILESYSTEM                  1045
+#define IDT_CLUSTER                     1046
+#define IDT_RANDOM_POOL                 1047
+#define IDT_HEADER_KEY                  1048
+#define IDT_MASTER_KEY                  1049
+#define IDT_DONE                        1050
+#define IDT_SPEED                       1051
+#define IDT_LEFT                        1052
+#define IDT_CONFIRM                     1053
+#define IDT_PASSWORD                    1054
+#define IDC_SHOW_PASSWORD_SINGLE        1055
+#define IDC_SHOW_PASSWORD               1056
+#define IDC_LINK_MORE_INFO_ABOUT_CIPHER 1057
+#define IDC_LINK_HASH_INFO              1058
+#define IDC_POS_BOX                     1059
+#define IDC_BITMAP_WIZARD               1060
+#define IDC_FILE_CONTAINER              1061
+#define IDC_NONSYS_DEVICE               1062
+#define IDC_SYS_DEVICE                  1063
+#define IDT_FILE_CONTAINER              1064
+#define IDT_NON_SYS_DEVICE              1065
+#define IDT_SYS_DEVICE                  1066
+#define IDC_WHOLE_SYS_DRIVE             1067
+#define IDC_SYS_PARTITION               1068
+#define IDT_WHOLE_SYS_DRIVE             1069
+#define IDT_SYS_PARTITION               1070
+#define IDT_RESCUE_DISK_INFO            1071
+#define IDC_MORE_INFO                   1072
+#define IDC_MORE_INFO_ON_SYS_ENCRYPTION 1073
+#define IDT_COLLECTING_RANDOM_DATA_NOTE 1074
+#define IDC_MORE_INFO_ON_CONTAINERS     1075
+#define IDC_SINGLE_BOOT                 1076
+#define IDC_MULTI_BOOT                  1077
+#define IDT_MULTI_BOOT                  1078
+#define IDT_SINGLE_BOOT                 1079
+#define IDC_SYS_POOL_CONTENTS           1080
+#define IDT_PARTIAL_POOL_CONTENTS       1081
+#define IDC_DOWNLOAD_CD_BURN_SOFTWARE   1082
+#define IDT_RESCUE_DISK_BURN_INFO       1083
+#define IDT_WIPE_MODE_INFO              1084
+#define IDC_WIPE_MODE                   1085
+#define IDC_SELECT                      1086
+#define IDT_SYSENC_KEYS_GEN_INFO        1087
+#define IDC_DISPLAY_KEYS                1088
+#define IDC_PAUSE                       1089
+#define IDT_WIPE_MODE                   1090
+#define IDC_MORE_INFO_SYS_ENCRYPTION    1091
+#define IDC_BOX_HELP_NORMAL_VOL         1092
+#define IDT_STATUS                      1093
+#define IDT_PROGRESS                    1094
+#define IDT_SYSENC_DRIVE_ANALYSIS_INFO  1095
+#define IDC_SYSENC_NORMAL               1096
+#define IDC_SYSENC_HIDDEN               1097
+#define IDC_BOX_HELP_SYSENC_NORMAL      1098
+#define IDC_HIDDEN_SYSENC_INFO_LINK     1099
+#define IDT_PASS                        1100
+#define IDC_DEVICE_TRANSFORM_MODE_FORMAT 1101
+#define IDC_DEVICE_TRANSFORM_MODE_INPLACE 1102
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        132
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1103
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
--- a/src/Format/Tcformat.h
+++ b/src/Format/Tcformat.h
@@ -0,0 +1,104 @@
+/*
+ Legal Notice: Some portions of the source code contained in this file were
+ derived from the source code of Encryption for the Masses 2.02a, which is
+ Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
+ Agreement for Encryption for the Masses'. Modifications and additions to
+ the original source code (contained in this file) and all other portions
+ of this file are Copyright (c) 2003-2009 TrueCrypt Developers Association
+ and are 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. */
+
+#include "Common/Common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define NBR_KEY_BYTES_TO_DISPLAY	16
+#define KEY_GUI_VIEW_SIZE			64		// Max characters of the key hex dump to display
+
+enum timer_ids
+{
+	TIMER_ID_RANDVIEW = 0xff,
+	TIMER_ID_SYSENC_PROGRESS,
+	TIMER_ID_NONSYS_INPLACE_ENC_PROGRESS,
+	TIMER_ID_WIPE_PROGRESS,
+	TIMER_ID_SYSENC_DRIVE_ANALYSIS_PROGRESS,
+	TIMER_ID_KEYB_LAYOUT_GUARD
+};
+
+static void localcleanup ( void );
+static void LoadSettings ( HWND hwndDlg );
+static void SaveSettings ( HWND hwndDlg );
+static void EndMainDlg ( HWND hwndDlg );
+void ComboSelChangeEA ( HWND hwndDlg );
+static void VerifySizeAndUpdate ( HWND hwndDlg , BOOL bUpdate );
+static void __cdecl sysEncDriveAnalysisThread (void *hwndDlgArg);
+static void __cdecl volTransformThreadFunction ( void *hwndDlg );
+static void LoadPage ( HWND hwndDlg , int nPageNo );
+int PrintFreeSpace ( HWND hwndTextBox , char *lpszDrive , PLARGE_INTEGER lDiskFree );
+void DisplaySizingErrorText ( HWND hwndTextBox );
+void EnableDisableFileNext ( HWND hComboBox , HWND hMainButton );
+BOOL QueryFreeSpace ( HWND hwndDlg , HWND hwndTextBox , BOOL display );
+static BOOL FinalPreTransformPrompts (void);
+void HandleOldAssignedDriveLetter (void);
+void AddCipher ( HWND hComboBox , char *lpszCipher , int nCipher );
+BOOL CALLBACK PageDialogProc ( HWND hwndDlg , UINT uMsg , WPARAM wParam , LPARAM lParam );
+BOOL CALLBACK MainDialogProc ( HWND hwndDlg , UINT uMsg , WPARAM wParam , LPARAM lParam );
+void ExtractCommandLine ( HWND hwndDlg , char *lpszCommandLine );
+void DisplayRandPool (HWND hPoolDisplay, BOOL bShow);
+void DisplayPortionsOfKeys (HWND headerKeyHandle, HWND masterKeyHandle, char *headerKeyStr, char *masterKeyStr, BOOL hideKeys);
+int DetermineMaxHiddenVolSize (HWND hwndDlg);
+BOOL IsSparseFile (HWND hwndDlg);
+BOOL GetFileVolSize (HWND hwndDlg, unsigned __int64 *size);
+BOOL SwitchWizardToSysEncMode (void);
+void SwitchWizardToFileContainerMode (void);
+static BOOL ResolveUnknownSysEncDirection (void);
+static BOOL WipeHiddenOSCreationConfig (void);
+static void AfterWMInitTasks (HWND hwndDlg);
+static void AfterSysEncProgressWMInitTasks (HWND hwndDlg);
+static void InitSysEncProgressBar (void);
+static void InitNonSysInplaceEncProgressBar (void);
+static void UpdateNonSysInplaceEncProgressBar (void);
+static BOOL SysEncInEffect (void);
+static BOOL CreatingHiddenSysVol(void);
+static void NonSysInplaceEncPause (void);
+static void NonSysInplaceEncResume (void);
+void ShowNonSysInPlaceEncUIStatus (void);
+void UpdateNonSysInPlaceEncControls (void);
+int MountHiddenVolHost ( HWND hwndDlg, char *volumePath, int *driveNo, Password *password, BOOL bReadOnly );
+int AnalyzeHiddenVolumeHost (HWND hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *pnbrFreeClusters);
+int ScanVolClusterBitmap ( HWND hwndDlg, int *driveNo, __int64 nbrClusters, __int64 *nbrFreeClusters);
+static void WipeStart (void);
+static void WipeAbort (void);
+static void UpdateWipeProgressBar (void);
+static void InitWipeProgressBar (void);
+static void UpdateWipeControls (void);
+static int GetFormatSectorSize ();
+
+extern BOOL showKeys;
+extern volatile HWND hMasterKey;
+extern volatile HWND hHeaderKey;
+extern volatile BOOL bHiddenVolHost;
+extern volatile BOOL bHiddenVolDirect;
+extern BOOL bRemovableHostDevice;
+extern BOOL bWarnDeviceFormatAdvanced;
+extern HWND hCurPage;
+extern HWND hProgressBar;
+extern volatile BOOL bVolTransformThreadCancel;
+extern volatile BOOL bInPlaceEncNonSysResumed;
+extern volatile BOOL bFirstNonSysInPlaceEncResumeDone;
+extern volatile BOOL bInPlaceEncNonSys;
+extern __int64 NonSysInplaceEncBytesDone;
+extern __int64 NonSysInplaceEncTotalSize;
+extern int nPbar;
+extern volatile int WizardMode;
+
+extern char HeaderKeyGUIView [KEY_GUI_VIEW_SIZE];
+extern char MasterKeyGUIView [KEY_GUI_VIEW_SIZE];
+extern volatile int NonSysInplaceEncStatus;
+
+#ifdef __cplusplus
+}
+#endif
--- a/src/Format/TrueCrypt_Wizard.bmp
+++ b/src/Format/TrueCrypt_Wizard.bmp