mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-12 11:28:26 -06:00
Windows: Full UNICODE rewrite and implement support for UNICODE passwords.
This commit is contained in:
Mounir IDRASSI
@@ -48,11 +48,11 @@ namespace VeraCrypt
|
||||
}
|
||||
|
||||
FavoriteVolume favorite;
|
||||
favorite.MountPoint = "X:\\";
|
||||
favorite.MountPoint[0] = (char) (prop.driveNo + 'A');
|
||||
favorite.MountPoint = L"X:\\";
|
||||
favorite.MountPoint[0] = (wchar_t) (prop.driveNo + L'A');
|
||||
|
||||
favorite.Path = WideToSingleString ((wchar_t *) prop.wszVolume);
|
||||
if (favorite.Path.find ("\\??\\") == 0)
|
||||
favorite.Path = prop.wszVolume;
|
||||
if (favorite.Path.find (L"\\??\\") == 0)
|
||||
favorite.Path = favorite.Path.substr (4);
|
||||
|
||||
if (wcslen (prop.wszLabel))
|
||||
@@ -64,30 +64,30 @@ namespace VeraCrypt
|
||||
if (IsVolumeDeviceHosted (favorite.Path.c_str()))
|
||||
{
|
||||
// Get GUID path
|
||||
string volumeDevPath = favorite.Path;
|
||||
wstring volumeDevPath = favorite.Path;
|
||||
|
||||
wchar_t resolvedVolumeDevPath[TC_MAX_PATH];
|
||||
if (ResolveSymbolicLink (SingleStringToWide (volumeDevPath).c_str(), resolvedVolumeDevPath, sizeof(resolvedVolumeDevPath)))
|
||||
volumeDevPath = WideToSingleString (resolvedVolumeDevPath);
|
||||
if (ResolveSymbolicLink (volumeDevPath.c_str(), resolvedVolumeDevPath, sizeof(resolvedVolumeDevPath)))
|
||||
volumeDevPath = resolvedVolumeDevPath;
|
||||
|
||||
char volumeName[TC_MAX_PATH];
|
||||
HANDLE find = FindFirstVolume (volumeName, sizeof (volumeName));
|
||||
wchar_t volumeName[TC_MAX_PATH];
|
||||
HANDLE find = FindFirstVolume (volumeName, ARRAYSIZE (volumeName));
|
||||
|
||||
if (find != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
do
|
||||
{
|
||||
char findVolumeDevPath[TC_MAX_PATH];
|
||||
string vn = volumeName;
|
||||
wchar_t findVolumeDevPath[TC_MAX_PATH];
|
||||
wstring vn = volumeName;
|
||||
|
||||
if (QueryDosDevice (vn.substr (4, vn.size() - 5).c_str(), findVolumeDevPath, sizeof (findVolumeDevPath)) != 0
|
||||
if (QueryDosDevice (vn.substr (4, vn.size() - 5).c_str(), findVolumeDevPath, ARRAYSIZE (findVolumeDevPath)) != 0
|
||||
&& volumeDevPath == findVolumeDevPath)
|
||||
{
|
||||
favorite.VolumePathId = volumeName;
|
||||
break;
|
||||
}
|
||||
|
||||
} while (FindNextVolume (find, volumeName, sizeof (volumeName)));
|
||||
} while (FindNextVolume (find, volumeName, ARRAYSIZE (volumeName)));
|
||||
|
||||
FindVolumeClose (find);
|
||||
}
|
||||
@@ -101,9 +101,9 @@ namespace VeraCrypt
|
||||
|
||||
if (favorite.VolumePathId.empty()
|
||||
&& IsVolumeDeviceHosted (favorite.Path.c_str())
|
||||
&& favorite.Path.find ("\\\\?\\Volume{") != 0)
|
||||
&& favorite.Path.find (L"\\\\?\\Volume{") != 0)
|
||||
{
|
||||
Warning (favorite.Path.find ("\\Partition0") == string::npos ? "FAVORITE_ADD_PARTITION_TYPE_WARNING" : "FAVORITE_ADD_DRIVE_DEV_WARNING", hwndDlg);
|
||||
Warning (favorite.Path.find (L"\\Partition0") == wstring::npos ? "FAVORITE_ADD_PARTITION_TYPE_WARNING" : "FAVORITE_ADD_DRIVE_DEV_WARNING", hwndDlg);
|
||||
}
|
||||
|
||||
return OrganizeFavoriteVolumes (hwndDlg, systemFavorites, favorite);
|
||||
@@ -429,7 +429,7 @@ namespace VeraCrypt
|
||||
if (FavoriteVolumes.empty())
|
||||
return;
|
||||
|
||||
AppendMenu (FavoriteVolumesMenu, MF_SEPARATOR, 0, "");
|
||||
AppendMenu (FavoriteVolumesMenu, MF_SEPARATOR, 0, L"");
|
||||
|
||||
int i = 0;
|
||||
foreach (const FavoriteVolume &favorite, FavoriteVolumes)
|
||||
@@ -439,7 +439,7 @@ namespace VeraCrypt
|
||||
if (favorite.DisconnectedDevice)
|
||||
flags |= MF_GRAYED;
|
||||
|
||||
wstring menuText = SingleStringToWide (favorite.Path);
|
||||
wstring menuText = favorite.Path;
|
||||
if (favorite.DisconnectedDevice)
|
||||
menuText = favorite.Label.empty() ? wstring (L"(") + GetString ("FAVORITE_DISCONNECTED_DEV") + L")" : L"";
|
||||
|
||||
@@ -452,7 +452,7 @@ namespace VeraCrypt
|
||||
}
|
||||
|
||||
AppendMenuW (FavoriteVolumesMenu, flags, TC_FAVORITE_MENU_CMD_ID_OFFSET + i++,
|
||||
(menuText + L"\t" + SingleStringToWide (favorite.MountPoint).substr (0, 2)).c_str());
|
||||
(menuText + L"\t" + favorite.MountPoint.substr (0, 2)).c_str());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -464,7 +464,7 @@ namespace VeraCrypt
|
||||
int line = 0;
|
||||
foreach (const FavoriteVolume favorite, favorites)
|
||||
{
|
||||
ListItemAdd (favoriteListControl, line, (char *) favorite.MountPoint.substr (0, 2).c_str());
|
||||
ListItemAdd (favoriteListControl, line, (wchar_t *) favorite.MountPoint.substr (0, 2).c_str());
|
||||
FillListControlSubItems (favoriteListControl, line++, favorite);
|
||||
}
|
||||
}
|
||||
@@ -472,16 +472,16 @@ namespace VeraCrypt
|
||||
|
||||
static void FillListControlSubItems (HWND FavoriteListControl, int line, const FavoriteVolume &favorite)
|
||||
{
|
||||
ListSubItemSetW (FavoriteListControl, line, 1, (wchar_t *) favorite.Label.c_str());
|
||||
ListSubItemSet (FavoriteListControl, line, 1, (wchar_t *) favorite.Label.c_str());
|
||||
|
||||
if (favorite.DisconnectedDevice)
|
||||
ListSubItemSetW (FavoriteListControl, line, 2, (wchar_t *) (wstring (L"(") + GetString ("FAVORITE_DISCONNECTED_DEV") + L")").c_str());
|
||||
ListSubItemSet (FavoriteListControl, line, 2, (wchar_t *) (wstring (L"(") + GetString ("FAVORITE_DISCONNECTED_DEV") + L")").c_str());
|
||||
else
|
||||
ListSubItemSet (FavoriteListControl, line, 2, (char *) favorite.Path.c_str());
|
||||
ListSubItemSet (FavoriteListControl, line, 2, (wchar_t *) favorite.Path.c_str());
|
||||
}
|
||||
|
||||
|
||||
wstring GetFavoriteVolumeLabel (const string &volumePath, bool& useInExplorer)
|
||||
wstring GetFavoriteVolumeLabel (const wstring &volumePath, bool& useInExplorer)
|
||||
{
|
||||
foreach (const FavoriteVolume &favorite, FavoriteVolumes)
|
||||
{
|
||||
@@ -523,7 +523,7 @@ namespace VeraCrypt
|
||||
void LoadFavoriteVolumes (vector <FavoriteVolume> &favorites, bool systemFavorites, bool noUacElevation)
|
||||
{
|
||||
favorites.clear();
|
||||
string favoritesFilePath = systemFavorites ? GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, false) : GetConfigPath (TC_APPD_FILENAME_FAVORITE_VOLUMES);
|
||||
wstring favoritesFilePath = systemFavorites ? GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, false) : GetConfigPath (TC_APPD_FILENAME_FAVORITE_VOLUMES);
|
||||
|
||||
if (systemFavorites && !IsAdmin() && !noUacElevation)
|
||||
{
|
||||
@@ -560,10 +560,10 @@ namespace VeraCrypt
|
||||
FavoriteVolume favorite;
|
||||
|
||||
XmlGetAttributeText (xml, "mountpoint", mountPoint, sizeof (mountPoint));
|
||||
favorite.MountPoint = mountPoint;
|
||||
favorite.MountPoint = Utf8StringToWide (mountPoint);
|
||||
|
||||
XmlGetNodeText (xml, volume, sizeof (volume));
|
||||
favorite.Path = WideToSingleString (Utf8StringToWide (volume));
|
||||
favorite.Path = Utf8StringToWide (volume);
|
||||
|
||||
char label[1024];
|
||||
XmlGetAttributeText (xml, "label", label, sizeof (label));
|
||||
@@ -612,9 +612,9 @@ namespace VeraCrypt
|
||||
if (boolVal[0])
|
||||
favorite.UseLabelInExplorer = (boolVal[0] == '1') && !favorite.ReadOnly;
|
||||
|
||||
if (favorite.Path.find ("\\\\?\\Volume{") == 0 && favorite.Path.rfind ("}\\") == favorite.Path.size() - 2)
|
||||
if (favorite.Path.find (L"\\\\?\\Volume{") == 0 && favorite.Path.rfind (L"}\\") == favorite.Path.size() - 2)
|
||||
{
|
||||
string resolvedPath = VolumeGuidPathToDevicePath (favorite.Path);
|
||||
wstring resolvedPath = VolumeGuidPathToDevicePath (favorite.Path);
|
||||
if (!resolvedPath.empty())
|
||||
{
|
||||
favorite.DisconnectedDevice = false;
|
||||
@@ -688,26 +688,26 @@ namespace VeraCrypt
|
||||
FILE *f;
|
||||
int cnt = 0;
|
||||
|
||||
f = fopen (GetConfigPath (systemFavorites ? TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES : TC_APPD_FILENAME_FAVORITE_VOLUMES), "w,ccs=UTF-8");
|
||||
f = _wfopen (GetConfigPath (systemFavorites ? TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES : TC_APPD_FILENAME_FAVORITE_VOLUMES), L"w,ccs=UTF-8");
|
||||
if (f == NULL)
|
||||
{
|
||||
handleWin32Error (MainDlg, SRC_POS);
|
||||
return false;
|
||||
}
|
||||
|
||||
XmlWriteHeaderW (f);
|
||||
XmlWriteHeader (f);
|
||||
fputws (L"\n\t<favorites>", f);
|
||||
|
||||
foreach (const FavoriteVolume &favorite, favorites)
|
||||
{
|
||||
char tq[2048];
|
||||
wchar_t tq[2048];
|
||||
|
||||
if (systemFavorites && favorite.Path.find ("\\\\") == 0 && favorite.Path.find ("Volume{") == string::npos)
|
||||
if (systemFavorites && favorite.Path.find (L"\\\\") == 0 && favorite.Path.find (L"Volume{") == wstring::npos)
|
||||
Warning ("SYSTEM_FAVORITE_NETWORK_PATH_ERR", hwndDlg);
|
||||
|
||||
XmlQuoteText (!favorite.VolumePathId.empty() ? favorite.VolumePathId.c_str() : favorite.Path.c_str(), tq, sizeof (tq));
|
||||
XmlQuoteTextW (!favorite.VolumePathId.empty() ? favorite.VolumePathId.c_str() : favorite.Path.c_str(), tq, ARRAYSIZE (tq));
|
||||
|
||||
wstring s = L"\n\t\t<volume mountpoint=\"" + SingleStringToWide (favorite.MountPoint) + L"\"";
|
||||
wstring s = L"\n\t\t<volume mountpoint=\"" + favorite.MountPoint + L"\"";
|
||||
|
||||
if (!favorite.Label.empty())
|
||||
s += L" label=\"" + favorite.Label + L"\"";
|
||||
@@ -739,14 +739,14 @@ namespace VeraCrypt
|
||||
if (favorite.UseLabelInExplorer && !favorite.ReadOnly)
|
||||
s += L" useLabelInExplorer=\"1\"";
|
||||
|
||||
s += L">" + SingleStringToWide (tq) + L"</volume>";
|
||||
s += L">" + wstring (tq) + L"</volume>";
|
||||
|
||||
fwprintf (f, L"%ws", s.c_str());
|
||||
cnt++;
|
||||
}
|
||||
|
||||
fputws (L"\n\t</favorites>", f);
|
||||
XmlWriteFooterW (f);
|
||||
XmlWriteFooter (f);
|
||||
|
||||
if (!CheckFileStreamWriteErrors (hwndDlg, f, systemFavorites ? TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES : TC_APPD_FILENAME_FAVORITE_VOLUMES))
|
||||
{
|
||||
@@ -760,7 +760,7 @@ namespace VeraCrypt
|
||||
|
||||
if (systemFavorites)
|
||||
{
|
||||
finally_do ({ remove (GetConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES)); });
|
||||
finally_do ({ _wremove (GetConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES)); });
|
||||
|
||||
try
|
||||
{
|
||||
@@ -796,7 +796,7 @@ namespace VeraCrypt
|
||||
catch (...) { }
|
||||
}
|
||||
else
|
||||
remove (GetConfigPath (TC_APPD_FILENAME_FAVORITE_VOLUMES));
|
||||
_wremove (GetConfigPath (TC_APPD_FILENAME_FAVORITE_VOLUMES));
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -807,12 +807,12 @@ namespace VeraCrypt
|
||||
{
|
||||
if (favorite.Pim > 0)
|
||||
{
|
||||
char szTmp[MAX_PIM + 1];
|
||||
StringCbPrintfA (szTmp, sizeof(szTmp), "%d", favorite.Pim);
|
||||
wchar_t szTmp[MAX_PIM + 1];
|
||||
StringCbPrintfW (szTmp, sizeof(szTmp), L"%d", favorite.Pim);
|
||||
SetDlgItemText (hwndDlg, IDC_PIM, szTmp);
|
||||
}
|
||||
else
|
||||
SetDlgItemText (hwndDlg, IDC_PIM, "");
|
||||
SetDlgItemText (hwndDlg, IDC_PIM, L"");
|
||||
SetDlgItemTextW (hwndDlg, IDC_FAVORITE_LABEL, favorite.Label.c_str());
|
||||
SetCheckBox (hwndDlg, IDC_FAVORITE_USE_LABEL_IN_EXPLORER, favorite.UseLabelInExplorer);
|
||||
SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_ON_LOGON, favorite.MountOnLogOn);
|
||||
@@ -886,24 +886,24 @@ namespace VeraCrypt
|
||||
|
||||
if (favorite.VolumePathId.empty()
|
||||
&& IsVolumeDeviceHosted (favorite.Path.c_str())
|
||||
&& favorite.Path.find ("\\\\?\\Volume{") != 0)
|
||||
&& favorite.Path.find (L"\\\\?\\Volume{") != 0)
|
||||
{
|
||||
bool partition = (favorite.Path.find ("\\Partition0") == string::npos);
|
||||
bool partition = (favorite.Path.find (L"\\Partition0") == wstring::npos);
|
||||
|
||||
if (!favorite.Label.empty())
|
||||
{
|
||||
ErrorDirect ((GetString (partition ? "FAVORITE_LABEL_PARTITION_TYPE_ERR" : "FAVORITE_LABEL_DEVICE_PATH_ERR") + wstring (L"\n\n") + SingleStringToWide (favorite.Path)).c_str(), hwndDlg);
|
||||
ErrorDirect ((GetString (partition ? "FAVORITE_LABEL_PARTITION_TYPE_ERR" : "FAVORITE_LABEL_DEVICE_PATH_ERR") + wstring (L"\n\n") + favorite.Path).c_str(), hwndDlg);
|
||||
favorite.Label.clear();
|
||||
}
|
||||
|
||||
if (favorite.MountOnArrival)
|
||||
{
|
||||
ErrorDirect ((GetString (partition ? "FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR" : "FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR") + wstring (L"\n\n") + SingleStringToWide (favorite.Path)).c_str(), hwndDlg);
|
||||
ErrorDirect ((GetString (partition ? "FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR" : "FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR") + wstring (L"\n\n") + favorite.Path).c_str(), hwndDlg);
|
||||
favorite.MountOnArrival = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (favorite.MountOnArrival && favorite.Path.find ("\\\\") == 0 && favorite.Path.find ("Volume{") == string::npos)
|
||||
if (favorite.MountOnArrival && favorite.Path.find (L"\\\\") == 0 && favorite.Path.find (L"Volume{") == wstring::npos)
|
||||
{
|
||||
Error ("FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR", hwndDlg);
|
||||
favorite.MountOnArrival = false;
|
||||
|
||||
@@ -34,9 +34,9 @@ namespace VeraCrypt
|
||||
{
|
||||
}
|
||||
|
||||
string Path;
|
||||
string MountPoint;
|
||||
string VolumePathId;
|
||||
wstring Path;
|
||||
wstring MountPoint;
|
||||
wstring VolumePathId;
|
||||
wstring Label;
|
||||
int Pim;
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace VeraCrypt
|
||||
static void FillFavoriteVolumesMenu ();
|
||||
static void FillListControl (HWND favoriteListControl, vector <FavoriteVolume> &favorites);
|
||||
static void FillListControlSubItems (HWND favoriteListControl, int line, const FavoriteVolume &favorite);
|
||||
wstring GetFavoriteVolumeLabel (const string &volumePath, bool& useInExplorer);
|
||||
wstring GetFavoriteVolumeLabel (const wstring &volumePath, bool& useInExplorer);
|
||||
void LoadFavoriteVolumes ();
|
||||
void LoadFavoriteVolumes (vector <FavoriteVolume> &favorites, bool systemFavorites, bool noUacElevation = false);
|
||||
static void OnFavoriteVolumesUpdated ();
|
||||
|
||||
@@ -79,24 +79,14 @@ public:
|
||||
|
||||
virtual int STDMETHODCALLTYPE BackupVolumeHeader (LONG_PTR hwndDlg, BOOL bRequireConfirmation, BSTR lpszVolume)
|
||||
{
|
||||
USES_CONVERSION;
|
||||
CW2A szVolumeA(lpszVolume);
|
||||
MainDlg = (HWND) hwndDlg;
|
||||
if (szVolumeA.m_psz)
|
||||
return ::BackupVolumeHeader ((HWND) hwndDlg, bRequireConfirmation, szVolumeA.m_psz);
|
||||
else
|
||||
return ERR_OUTOFMEMORY;
|
||||
return ::BackupVolumeHeader ((HWND) hwndDlg, bRequireConfirmation, lpszVolume);
|
||||
}
|
||||
|
||||
virtual int STDMETHODCALLTYPE RestoreVolumeHeader (LONG_PTR hwndDlg, BSTR lpszVolume)
|
||||
{
|
||||
USES_CONVERSION;
|
||||
CW2A szVolumeA(lpszVolume);
|
||||
MainDlg = (HWND) hwndDlg;
|
||||
if (szVolumeA.m_psz)
|
||||
return ::RestoreVolumeHeader ((HWND) hwndDlg, szVolumeA.m_psz);
|
||||
else
|
||||
return ERR_OUTOFMEMORY;
|
||||
return ::RestoreVolumeHeader ((HWND) hwndDlg, lpszVolume);
|
||||
}
|
||||
|
||||
virtual DWORD STDMETHODCALLTYPE CallDriver (DWORD ioctl, BSTR input, BSTR *output)
|
||||
@@ -106,13 +96,8 @@ public:
|
||||
|
||||
virtual int STDMETHODCALLTYPE ChangePassword (BSTR volumePath, Password *oldPassword, Password *newPassword, int pkcs5, int wipePassCount, LONG_PTR hWnd)
|
||||
{
|
||||
USES_CONVERSION;
|
||||
CW2A volumePathA(volumePath);
|
||||
MainDlg = (HWND) hWnd;
|
||||
if (volumePathA.m_psz)
|
||||
return ::ChangePwd (volumePathA.m_psz, oldPassword, 0, 0, FALSE, newPassword, pkcs5, 0, wipePassCount, (HWND) hWnd);
|
||||
else
|
||||
return ERR_OUTOFMEMORY;
|
||||
return ::ChangePwd (volumePath, oldPassword, 0, 0, FALSE, newPassword, pkcs5, 0, wipePassCount, (HWND) hWnd);
|
||||
}
|
||||
|
||||
virtual DWORD STDMETHODCALLTYPE CopyFile (BSTR sourceFile, BSTR destinationFile)
|
||||
@@ -157,35 +142,20 @@ public:
|
||||
|
||||
virtual int STDMETHODCALLTYPE ChangePasswordEx (BSTR volumePath, Password *oldPassword, int old_pkcs5, Password *newPassword, int pkcs5, int wipePassCount, LONG_PTR hWnd)
|
||||
{
|
||||
USES_CONVERSION;
|
||||
CW2A volumePathA(volumePath);
|
||||
MainDlg = (HWND) hWnd;
|
||||
if (volumePathA.m_psz)
|
||||
return ::ChangePwd (volumePathA.m_psz, oldPassword, old_pkcs5, 0, FALSE, newPassword, pkcs5, 0, wipePassCount, (HWND) hWnd);
|
||||
else
|
||||
return ERR_OUTOFMEMORY;
|
||||
return ::ChangePwd (volumePath, oldPassword, old_pkcs5, 0, FALSE, newPassword, pkcs5, 0, wipePassCount, (HWND) hWnd);
|
||||
}
|
||||
|
||||
virtual int STDMETHODCALLTYPE ChangePasswordEx2 (BSTR volumePath, Password *oldPassword, int old_pkcs5, BOOL truecryptMode, Password *newPassword, int pkcs5, int wipePassCount, LONG_PTR hWnd)
|
||||
{
|
||||
USES_CONVERSION;
|
||||
CW2A volumePathA(volumePath);
|
||||
MainDlg = (HWND) hWnd;
|
||||
if (volumePathA.m_psz)
|
||||
return ::ChangePwd (volumePathA.m_psz, oldPassword, old_pkcs5, 0, truecryptMode, newPassword, pkcs5, 0, wipePassCount, (HWND) hWnd);
|
||||
else
|
||||
return ERR_OUTOFMEMORY;
|
||||
return ::ChangePwd (volumePath, oldPassword, old_pkcs5, 0, truecryptMode, newPassword, pkcs5, 0, wipePassCount, (HWND) hWnd);
|
||||
}
|
||||
|
||||
virtual int STDMETHODCALLTYPE ChangePasswordEx3 (BSTR volumePath, Password *oldPassword, int old_pkcs5, int old_pim, BOOL truecryptMode, Password *newPassword, int pkcs5, int pim, int wipePassCount, LONG_PTR hWnd)
|
||||
{
|
||||
USES_CONVERSION;
|
||||
CW2A volumePathA(volumePath);
|
||||
MainDlg = (HWND) hWnd;
|
||||
if (volumePathA.m_psz)
|
||||
return ::ChangePwd (volumePathA.m_psz, oldPassword, old_pkcs5, old_pim, truecryptMode, newPassword, pkcs5, pim, wipePassCount, (HWND) hWnd);
|
||||
else
|
||||
return ERR_OUTOFMEMORY;
|
||||
return ::ChangePwd (volumePath, oldPassword, old_pkcs5, old_pim, truecryptMode, newPassword, pkcs5, pim, wipePassCount, (HWND) hWnd);
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -245,7 +215,7 @@ ITrueCryptMainCom *GetElevatedInstance (HWND parent)
|
||||
}
|
||||
|
||||
|
||||
extern "C" int UacBackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, char *lpszVolume)
|
||||
extern "C" int UacBackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, wchar_t *lpszVolume)
|
||||
{
|
||||
CComPtr<ITrueCryptMainCom> tc;
|
||||
int r;
|
||||
@@ -255,7 +225,7 @@ extern "C" int UacBackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, c
|
||||
if (ComGetInstance (hwndDlg, &tc))
|
||||
{
|
||||
CComBSTR volumeBstr;
|
||||
BSTR bstr = A2WBSTR(lpszVolume);
|
||||
BSTR bstr = W2BSTR(lpszVolume);
|
||||
if (bstr)
|
||||
{
|
||||
volumeBstr.Attach (bstr);
|
||||
@@ -273,7 +243,7 @@ extern "C" int UacBackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, c
|
||||
}
|
||||
|
||||
|
||||
extern "C" int UacRestoreVolumeHeader (HWND hwndDlg, char *lpszVolume)
|
||||
extern "C" int UacRestoreVolumeHeader (HWND hwndDlg, wchar_t *lpszVolume)
|
||||
{
|
||||
CComPtr<ITrueCryptMainCom> tc;
|
||||
int r;
|
||||
@@ -283,7 +253,7 @@ extern "C" int UacRestoreVolumeHeader (HWND hwndDlg, char *lpszVolume)
|
||||
if (ComGetInstance (hwndDlg, &tc))
|
||||
{
|
||||
CComBSTR volumeBstr;
|
||||
BSTR bstr = A2WBSTR(lpszVolume);
|
||||
BSTR bstr = W2BSTR(lpszVolume);
|
||||
if (bstr)
|
||||
{
|
||||
volumeBstr.Attach (bstr);
|
||||
@@ -301,7 +271,7 @@ extern "C" int UacRestoreVolumeHeader (HWND hwndDlg, char *lpszVolume)
|
||||
}
|
||||
|
||||
|
||||
extern "C" int UacChangePwd (char *lpszVolume, Password *oldPassword, int old_pkcs5, int old_pim, BOOL truecryptMode, Password *newPassword, int pkcs5, int pim, int wipePassCount, HWND hwndDlg)
|
||||
extern "C" int UacChangePwd (wchar_t *lpszVolume, Password *oldPassword, int old_pkcs5, int old_pim, BOOL truecryptMode, Password *newPassword, int pkcs5, int pim, int wipePassCount, HWND hwndDlg)
|
||||
{
|
||||
CComPtr<ITrueCryptMainCom> tc;
|
||||
int r;
|
||||
@@ -311,16 +281,7 @@ extern "C" int UacChangePwd (char *lpszVolume, Password *oldPassword, int old_pk
|
||||
if (ComGetInstance (hwndDlg, &tc))
|
||||
{
|
||||
WaitCursor ();
|
||||
CComBSTR volumeBstr;
|
||||
BSTR bstr = A2WBSTR(lpszVolume);
|
||||
if (bstr)
|
||||
{
|
||||
volumeBstr.Attach (bstr);
|
||||
|
||||
r = tc->ChangePasswordEx3 (volumeBstr, oldPassword, old_pkcs5, old_pim, truecryptMode, newPassword, pkcs5, pim, wipePassCount, (LONG_PTR) hwndDlg);
|
||||
}
|
||||
else
|
||||
r = ERR_OUTOFMEMORY;
|
||||
r = tc->ChangePasswordEx3 (lpszVolume, oldPassword, old_pkcs5, old_pim, truecryptMode, newPassword, pkcs5, pim, wipePassCount, (LONG_PTR) hwndDlg);
|
||||
NormalCursor ();
|
||||
}
|
||||
else
|
||||
|
||||
@@ -24,9 +24,9 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
BOOL ComServerMain ();
|
||||
int UacBackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, char *lpszVolume);
|
||||
int UacRestoreVolumeHeader (HWND hwndDlg, char *lpszVolume);
|
||||
int UacChangePwd (char *lpszVolume, Password *oldPassword, int old_pkcs5, int old_pim, BOOL truecryptMode, Password *newPassword, int pkcs5, int pim, int wipePassCount, HWND hwndDlg);
|
||||
int UacBackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, wchar_t *lpszVolume);
|
||||
int UacRestoreVolumeHeader (HWND hwndDlg, wchar_t *lpszVolume);
|
||||
int UacChangePwd (wchar_t *lpszVolume, Password *oldPassword, int old_pkcs5, int old_pim, BOOL truecryptMode, Password *newPassword, int pkcs5, int pim, int wipePassCount, HWND hwndDlg);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
1030
src/Mount/Mount.c
1030
src/Mount/Mount.c
File diff suppressed because it is too large
Load Diff
@@ -73,7 +73,7 @@ void EnableDisableButtons ( HWND hwndDlg );
|
||||
BOOL VolumeSelected (HWND hwndDlg );
|
||||
void LoadSettings ( HWND hwndDlg );
|
||||
void SaveSettings ( HWND hwndDlg );
|
||||
BOOL SelectItem ( HWND hTree , char nLetter );
|
||||
BOOL SelectItem ( HWND hTree , wchar_t nLetter );
|
||||
void LoadDriveLetters ( HWND hwndDlg, HWND hTree, int drive );
|
||||
BOOL CALLBACK PasswordChangeDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
|
||||
BOOL CALLBACK PasswordDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
|
||||
@@ -83,7 +83,7 @@ LPARAM GetSelectedLong ( HWND hTree );
|
||||
LPARAM GetItemLong ( HWND hTree, int itemNo );
|
||||
BOOL CALLBACK CommandHelpDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
|
||||
BOOL CALLBACK MainDialogProc ( HWND hwndDlg , UINT uMsg , WPARAM wParam , LPARAM lParam );
|
||||
void ExtractCommandLine ( HWND hwndDlg , char *lpszCommandLine );
|
||||
void ExtractCommandLine ( HWND hwndDlg , wchar_t *lpszCommandLine );
|
||||
static void WipeCache (HWND hwndDlg, BOOL silent);
|
||||
void OpenVolumeExplorerWindow (int driveNo);
|
||||
BOOL TaskBarIconAdd (HWND hwnd);
|
||||
@@ -101,11 +101,11 @@ int GetModeOfOperationByDriveNo (int nDosDriveNo);
|
||||
void ChangeMainWindowVisibility ();
|
||||
void LaunchVolCreationWizard (HWND hwndDlg);
|
||||
BOOL WholeSysDriveEncryption (BOOL bSilent);
|
||||
BOOL CheckSysEncMountWithoutPBA (HWND hwndDlg, const char *devicePath, BOOL quiet);
|
||||
BOOL TCBootLoaderOnInactiveSysEncDrive (char *szDevicePath);
|
||||
BOOL CheckSysEncMountWithoutPBA (HWND hwndDlg, const wchar_t *devicePath, BOOL quiet);
|
||||
BOOL TCBootLoaderOnInactiveSysEncDrive (wchar_t *szDevicePath);
|
||||
void CreateRescueDisk (HWND hwndDlg);
|
||||
int BackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, const char *lpszVolume);
|
||||
int RestoreVolumeHeader (HWND hwndDlg, const char *lpszVolume);
|
||||
int BackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, const wchar_t *lpszVolume);
|
||||
int RestoreVolumeHeader (HWND hwndDlg, const wchar_t *lpszVolume);
|
||||
void SecurityTokenPreferencesDialog (HWND hwndDlg);
|
||||
static BOOL CALLBACK PerformanceSettingsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||
static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
IntermediateDirectory="Debug"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
CharacterSet="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
@@ -110,103 +110,13 @@
|
||||
CommandLine="md "..\Debug\Setup Files" 2>NUL:
copy Debug\VeraCrypt.exe "..\Debug\Setup Files" >NUL:
"
|
||||
/>
|
||||
</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"
|
||||
AdditionalIncludeDirectories=""
|
||||
TypeLibraryName="$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb"
|
||||
OutputDirectory=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/w34189"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
|
||||
PreprocessorDefinitions="TCMOUNT;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;4701;4706"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="comctl32.lib setupapi.lib version.lib ..\Crypto\Release\crypto.lib"
|
||||
OutputFile="$(OutDir)/VeraCrypt.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="Mount.manifest"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy Release\VeraCrypt.exe "..\Release\Setup Files""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
CharacterSet="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
@@ -292,13 +202,103 @@
|
||||
CommandLine="md "..\Debug\Setup Files" 2>NUL:
copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL:
"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="Release"
|
||||
IntermediateDirectory="Release"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
AdditionalIncludeDirectories=""
|
||||
TypeLibraryName="$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb"
|
||||
OutputDirectory=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/w34189"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
|
||||
PreprocessorDefinitions="TCMOUNT;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;4701;4706"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="comctl32.lib setupapi.lib version.lib ..\Crypto\Release\crypto.lib"
|
||||
OutputFile="$(OutDir)/VeraCrypt.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="Mount.manifest"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy Release\VeraCrypt.exe "..\Release\Setup Files""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
CharacterSet="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
@@ -420,7 +420,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
Name="Debug|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -428,7 +428,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -483,7 +483,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
Name="Debug|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -491,7 +491,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -519,7 +519,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
Name="Debug|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -527,7 +527,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -567,7 +567,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
Name="Debug|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -575,7 +575,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
@@ -776,6 +776,38 @@
|
||||
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
|
||||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_Serpent_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_AES_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_Twofish_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_Serpent_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_AES_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_Twofish_SHA2\BootSector.bin"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Drive_icon_96dpi.bmp"
|
||||
>
|
||||
@@ -823,6 +855,18 @@
|
||||
<Filter
|
||||
Name="Common"
|
||||
>
|
||||
<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"
|
||||
>
|
||||
@@ -843,18 +887,6 @@
|
||||
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\Rescue\BootSector.bin"
|
||||
>
|
||||
@@ -899,7 +931,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
Name="Debug|x64"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
@@ -907,7 +939,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
@@ -953,6 +985,38 @@
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_AES_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_Serpent_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_Twofish_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_AES_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_Serpent_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Release_Twofish_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Boot\Windows\Rescue_SHA2\BootLoader.com.gz"
|
||||
>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
Reference in New Issue
Block a user