mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-10 13:13:34 +01:00
Windows: solve 64-bit compilation warnings after checking that they are harmless.
This commit is contained in:
Mounir IDRASSI
parent
a8651ac014
commit
85e5e383f9
@ -1721,7 +1721,7 @@ namespace VeraCrypt
|
||||
size_t verifiedSectorCount = (TC_CD_BOOTSECTOR_OFFSET + TC_ORIG_BOOT_LOADER_BACKUP_SECTOR_OFFSET + TC_BOOT_LOADER_AREA_SIZE) / 2048;
|
||||
Buffer buffer ((verifiedSectorCount + 1) * 2048);
|
||||
|
||||
DWORD bytesRead = driveDevice.Read (buffer.Ptr(), buffer.Size());
|
||||
DWORD bytesRead = driveDevice.Read (buffer.Ptr(), (DWORD) buffer.Size());
|
||||
if (bytesRead != buffer.Size())
|
||||
continue;
|
||||
|
||||
@ -1898,7 +1898,7 @@ namespace VeraCrypt
|
||||
|
||||
size_t strSize = filter.size() + 1;
|
||||
byte regKeyBuf[65536];
|
||||
DWORD size = sizeof (regKeyBuf) - strSize;
|
||||
DWORD size = (DWORD) (sizeof (regKeyBuf) - strSize);
|
||||
|
||||
// SetupInstallFromInfSection() does not support prepending of values so we have to modify the registry directly
|
||||
StringCbCopyA ((char *) regKeyBuf, sizeof(regKeyBuf), filter.c_str());
|
||||
@ -1906,7 +1906,7 @@ namespace VeraCrypt
|
||||
if (RegQueryValueEx (regKey, filterReg.c_str(), NULL, NULL, regKeyBuf + strSize, &size) != ERROR_SUCCESS)
|
||||
size = 1;
|
||||
|
||||
SetLastError (RegSetValueEx (regKey, filterReg.c_str(), 0, REG_MULTI_SZ, regKeyBuf, strSize + size));
|
||||
SetLastError (RegSetValueEx (regKey, filterReg.c_str(), 0, REG_MULTI_SZ, regKeyBuf, (DWORD) strSize + size));
|
||||
throw_sys_if (GetLastError() != ERROR_SUCCESS);
|
||||
}
|
||||
else
|
||||
@ -1921,7 +1921,7 @@ namespace VeraCrypt
|
||||
"[veracrypt_reg]\r\n"
|
||||
"HKR,,\"" + filterReg + "\",0x0001" + string (registerFilter ? "0008" : "8002") + ",\"" + filter + "\"\r\n";
|
||||
|
||||
infFile.Write ((byte *) infTxt.c_str(), infTxt.size());
|
||||
infFile.Write ((byte *) infTxt.c_str(), (DWORD) infTxt.size());
|
||||
infFile.Close();
|
||||
|
||||
HINF hInf = SetupOpenInfFile (infFileName.c_str(), NULL, INF_STYLE_OLDNT | INF_STYLE_WIN4, NULL);
|
||||
@ -2464,7 +2464,7 @@ namespace VeraCrypt
|
||||
try
|
||||
{
|
||||
device.SeekAt (config.DrivePartition.Info.PartitionLength.QuadPart - geometry.BytesPerSector);
|
||||
device.Read (sector.Ptr(), sector.Size());
|
||||
device.Read (sector.Ptr(), (DWORD) sector.Size());
|
||||
}
|
||||
catch (SystemException &e)
|
||||
{
|
||||
@ -2515,7 +2515,7 @@ namespace VeraCrypt
|
||||
StringCbCopyA (pagingFiles, sizeof(pagingFiles), "X:\\pagefile.sys 0 0");
|
||||
pagingFiles[0] = GetWindowsDirectory()[0];
|
||||
|
||||
throw_sys_if (!WriteLocalMachineRegistryMultiString ("System\\CurrentControlSet\\Control\\Session Manager\\Memory Management", "PagingFiles", pagingFiles, strlen (pagingFiles) + 2));
|
||||
throw_sys_if (!WriteLocalMachineRegistryMultiString ("System\\CurrentControlSet\\Control\\Session Manager\\Memory Management", "PagingFiles", pagingFiles, (DWORD) strlen (pagingFiles) + 2));
|
||||
}
|
||||
|
||||
void BootEncryption::WriteLocalMachineRegistryDwordValue (char *keyPath, char *valueName, DWORD value)
|
||||
|
||||
@ -107,7 +107,7 @@ int Win32CommandLine (char *lpszCommandLine, char ***lpszArgs)
|
||||
|
||||
if (argLen > 0)
|
||||
{
|
||||
int len = WideCharToMultiByte (CP_ACP, 0, arguments[i + 1], -1, arg, argLen + 1, NULL, NULL);
|
||||
int len = WideCharToMultiByte (CP_ACP, 0, arguments[i + 1], -1, arg, (int) argLen + 1, NULL, NULL);
|
||||
if (len == 0)
|
||||
{
|
||||
handleWin32Error (NULL);
|
||||
|
||||
@ -316,12 +316,12 @@ void cleanup ()
|
||||
|
||||
void LowerCaseCopy (char *lpszDest, const char *lpszSource)
|
||||
{
|
||||
int i = strlen (lpszSource);
|
||||
size_t i = strlen (lpszSource) + 1;
|
||||
|
||||
lpszDest[i] = 0;
|
||||
while (--i >= 0)
|
||||
lpszDest[i - 1] = 0;
|
||||
while (--i > 0)
|
||||
{
|
||||
lpszDest[i] = (char) tolower (lpszSource[i]);
|
||||
lpszDest[i - 1] = (char) tolower (lpszSource[i - 1]);
|
||||
}
|
||||
|
||||
}
|
||||
@ -330,14 +330,15 @@ void UpperCaseCopy (char *lpszDest, size_t cbDest, const char *lpszSource)
|
||||
{
|
||||
if (lpszDest && cbDest)
|
||||
{
|
||||
int i = strlen (lpszSource);
|
||||
if (i >= (int) cbDest)
|
||||
size_t i = strlen (lpszSource);
|
||||
if (i >= cbDest)
|
||||
i = cbDest - 1;
|
||||
|
||||
lpszDest[i] = 0;
|
||||
while (--i >= 0)
|
||||
i++;
|
||||
while (--i > 0)
|
||||
{
|
||||
lpszDest[i] = (char) toupper (lpszSource[i]);
|
||||
lpszDest[i - 1] = (char) toupper (lpszSource[i - 1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -511,7 +512,7 @@ void *err_malloc (size_t size)
|
||||
|
||||
char *err_strdup (char *lpszText)
|
||||
{
|
||||
int j = (strlen (lpszText) + 1) * sizeof (char);
|
||||
size_t j = (strlen (lpszText) + 1) * sizeof (char);
|
||||
char *z = (char *) err_malloc (j);
|
||||
memmove (z, lpszText, j);
|
||||
return z;
|
||||
@ -667,7 +668,7 @@ int GetTextGfxWidth (HWND hwndDlgItem, const wchar_t *text, HFONT hFont)
|
||||
|
||||
SelectObject(hdc, (HGDIOBJ) hFont);
|
||||
|
||||
GetTextExtentPoint32W (hdc, text, wcslen (text), &sizes);
|
||||
GetTextExtentPoint32W (hdc, text, (int) wcslen (text), &sizes);
|
||||
|
||||
GetTextMetrics(hdc, &textMetrics); // Necessary for non-TrueType raster fonts (tmOverhang)
|
||||
|
||||
@ -684,7 +685,7 @@ int GetTextGfxHeight (HWND hwndDlgItem, const wchar_t *text, HFONT hFont)
|
||||
|
||||
SelectObject(hdc, (HGDIOBJ) hFont);
|
||||
|
||||
GetTextExtentPoint32W (hdc, text, wcslen (text), &sizes);
|
||||
GetTextExtentPoint32W (hdc, text, (int) wcslen (text), &sizes);
|
||||
|
||||
ReleaseDC (hwndDlgItem, hdc);
|
||||
|
||||
@ -708,7 +709,7 @@ std::string FitPathInGfxWidth (HWND hwnd, HFONT hFont, LONG width, const std::st
|
||||
char pathBuf[TC_MAX_PATH];
|
||||
strcpy_s (pathBuf, sizeof (pathBuf), path.c_str());
|
||||
|
||||
if (DrawText (hdc, pathBuf, path.size(), &rect, DT_CALCRECT | DT_MODIFYSTRING | DT_PATH_ELLIPSIS | DT_SINGLELINE) != 0)
|
||||
if (DrawText (hdc, pathBuf, (int) path.size(), &rect, DT_CALCRECT | DT_MODIFYSTRING | DT_PATH_ELLIPSIS | DT_SINGLELINE) != 0)
|
||||
newPath = pathBuf;
|
||||
|
||||
ReleaseDC (hwnd, hdc);
|
||||
@ -1146,7 +1147,7 @@ void ToSBCS (LPWSTR lpszText, size_t cbSize)
|
||||
{
|
||||
if (lpszText)
|
||||
{
|
||||
int j = wcslen (lpszText);
|
||||
int j = (int) wcslen (lpszText);
|
||||
if (j == 0)
|
||||
{
|
||||
*((char *) lpszText) = 0;
|
||||
@ -1641,7 +1642,7 @@ SelectAlgo (HWND hComboBox, int *algo_id)
|
||||
/* Something went wrong ; couldn't find the requested algo id so we drop
|
||||
back to a default */
|
||||
|
||||
*algo_id = SendMessage (hComboBox, CB_GETITEMDATA, 0, 0);
|
||||
*algo_id = (int) SendMessage (hComboBox, CB_GETITEMDATA, 0, 0);
|
||||
|
||||
SendMessage (hComboBox, CB_SETCURSEL, 0, 0);
|
||||
|
||||
@ -2828,12 +2829,12 @@ int IsNonSysPartitionOnSysDrive (const char *path)
|
||||
strncpy (tmpPath, path, sizeof (tmpPath) - 1);
|
||||
|
||||
|
||||
pos = (int) FindString (tmpPath, "Partition", strlen (tmpPath), strlen ("Partition"), 0);
|
||||
pos = (int) FindString (tmpPath, "Partition", (int) strlen (tmpPath), (int) strlen ("Partition"), 0);
|
||||
|
||||
if (pos < 0)
|
||||
return -1;
|
||||
|
||||
pos += strlen ("Partition");
|
||||
pos += (int) strlen ("Partition");
|
||||
|
||||
if (pos + 1 > sizeof (tmpPath) - 1)
|
||||
return -1;
|
||||
@ -2912,7 +2913,7 @@ wstring GetDecoyOsInstructionsString (void)
|
||||
}
|
||||
|
||||
|
||||
BOOL TextInfoDialogBox (int nID)
|
||||
INT_PTR TextInfoDialogBox (int nID)
|
||||
{
|
||||
return DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_TEXT_INFO_DIALOG_BOX_DLG), MainDlg, (DLGPROC) TextInfoDialogBoxDlgProc, (LPARAM) nID);
|
||||
}
|
||||
@ -3970,7 +3971,7 @@ BOOL SelectMultipleFilesNext (char *lpszFileName, size_t cbFileName)
|
||||
|
||||
StringCbCatA (lpszFileName, cbFileName,SelectMultipleFilesPath + SelectMultipleFilesOffset);
|
||||
|
||||
SelectMultipleFilesOffset += strlen (SelectMultipleFilesPath + SelectMultipleFilesOffset) + 1;
|
||||
SelectMultipleFilesOffset += (int) strlen (SelectMultipleFilesPath + SelectMultipleFilesOffset) + 1;
|
||||
if (SelectMultipleFilesPath[SelectMultipleFilesOffset] == 0)
|
||||
SelectMultipleFilesOffset = 0;
|
||||
|
||||
@ -4950,7 +4951,7 @@ BOOL CALLBACK BenchmarkDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
|
||||
nIndex = SendMessage (hCboxSortMethod, CB_GETCURSEL, 0, 0);
|
||||
if (nIndex != benchmarkSortMethod)
|
||||
{
|
||||
benchmarkSortMethod = nIndex;
|
||||
benchmarkSortMethod = (int) nIndex;
|
||||
DisplayBenchmarkResults (hwndDlg);
|
||||
}
|
||||
return 1;
|
||||
@ -4958,7 +4959,7 @@ BOOL CALLBACK BenchmarkDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
|
||||
case IDC_PERFORM_BENCHMARK:
|
||||
|
||||
nIndex = SendMessage (hCboxBufferSize, CB_GETCURSEL, 0, 0);
|
||||
benchmarkBufferSize = SendMessage (hCboxBufferSize, CB_GETITEMDATA, nIndex, 0);
|
||||
benchmarkBufferSize = (int) SendMessage (hCboxBufferSize, CB_GETITEMDATA, nIndex, 0);
|
||||
|
||||
BenchmarkThreadParam threadParam;
|
||||
threadParam.hBenchDlg = hwndDlg;
|
||||
@ -5841,7 +5842,7 @@ ResetCipherTest(HWND hwndDlg, int idTestCipher)
|
||||
SendMessage (GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_RESETCONTENT, 0,0);
|
||||
SendMessage (GetDlgItem(hwndDlg, IDC_TEST_BLOCK_NUMBER), CB_RESETCONTENT, 0,0);
|
||||
|
||||
ndx = SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_ADDSTRING, 0,(LPARAM) "64");
|
||||
ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_ADDSTRING, 0,(LPARAM) "64");
|
||||
SendMessage(GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_SETITEMDATA, ndx,(LPARAM) 8);
|
||||
SendMessage(GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_SETCURSEL, ndx,0);
|
||||
|
||||
@ -5851,7 +5852,7 @@ ResetCipherTest(HWND hwndDlg, int idTestCipher)
|
||||
|
||||
StringCbPrintfA (tmpStr, sizeof(tmpStr), "%d", ndx);
|
||||
|
||||
ndx = SendMessage (GetDlgItem(hwndDlg, IDC_TEST_BLOCK_NUMBER), CB_ADDSTRING, 0,(LPARAM) tmpStr);
|
||||
ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_TEST_BLOCK_NUMBER), CB_ADDSTRING, 0,(LPARAM) tmpStr);
|
||||
SendMessage(GetDlgItem(hwndDlg, IDC_TEST_BLOCK_NUMBER), CB_SETITEMDATA, ndx,(LPARAM) ndx);
|
||||
}
|
||||
|
||||
@ -5865,12 +5866,12 @@ ResetCipherTest(HWND hwndDlg, int idTestCipher)
|
||||
|
||||
if (idTestCipher == AES || idTestCipher == SERPENT || idTestCipher == TWOFISH)
|
||||
{
|
||||
ndx = SendMessage (GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_ADDSTRING, 0,(LPARAM) "256");
|
||||
ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_ADDSTRING, 0,(LPARAM) "256");
|
||||
SendMessage(GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_SETITEMDATA, ndx,(LPARAM) 32);
|
||||
SendMessage(GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_SETCURSEL, ndx,0);
|
||||
|
||||
SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_RESETCONTENT, 0,0);
|
||||
ndx = SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_ADDSTRING, 0,(LPARAM) "128");
|
||||
ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_ADDSTRING, 0,(LPARAM) "128");
|
||||
SendMessage(GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_SETITEMDATA, ndx,(LPARAM) 16);
|
||||
SendMessage(GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_SETCURSEL, ndx,0);
|
||||
|
||||
@ -5960,7 +5961,7 @@ BOOL CALLBACK MultiChoiceDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPA
|
||||
} while (nStr < MAX_MULTI_CHOICES+1);
|
||||
|
||||
// Length of main message in characters (not bytes)
|
||||
nMainTextLenInChars = wcslen ((const wchar_t *) (bResolve ? GetString(*(pStrOrig+1)) : *(pwStrOrig+1)));
|
||||
nMainTextLenInChars = (int) wcslen ((const wchar_t *) (bResolve ? GetString(*(pStrOrig+1)) : *(pwStrOrig+1)));
|
||||
|
||||
if (nMainTextLenInChars > 200
|
||||
&& nMainTextLenInChars / nLongestButtonCaptionCharLen >= 10)
|
||||
@ -6000,7 +6001,7 @@ BOOL CALLBACK MultiChoiceDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPA
|
||||
offset = FindString ((char *) (bResolve ? GetString(*(pStrOrig+1)) : *(pwStrOrig+1)),
|
||||
(char *) L"\n",
|
||||
nMainTextLenInChars * 2,
|
||||
wcslen (L"\n") * 2,
|
||||
(int) wcslen (L"\n") * 2,
|
||||
offset + 1);
|
||||
|
||||
newLineSeqCount++;
|
||||
@ -7300,7 +7301,7 @@ HANDLE DismountDrive (char *devName, char *devicePath)
|
||||
// Returns -1 if the specified string is not found in the buffer. Otherwise, returns the
|
||||
// offset of the first occurrence of the string. The string and the buffer may contain zeroes,
|
||||
// which do NOT terminate them.
|
||||
int64 FindString (const char *buf, const char *str, int64 bufLen, size_t strLen, int64 startOffset)
|
||||
int64 FindString (const char *buf, const char *str, int64 bufLen, int64 strLen, int64 startOffset)
|
||||
{
|
||||
if (buf == NULL
|
||||
|| str == NULL
|
||||
@ -7544,7 +7545,7 @@ BOOL TCFlushFile (FILE *f)
|
||||
// Prints a UTF-16 text (note that this involves a real printer, not a screen).
|
||||
// textByteLen - length of the text in bytes
|
||||
// title - printed as part of the page header and used as the filename for a temporary file
|
||||
BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, int textByteLen)
|
||||
BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, size_t textByteLen)
|
||||
{
|
||||
char cl [MAX_PATH*3] = {"/p \""};
|
||||
char path [MAX_PATH * 2] = { 0 };
|
||||
@ -7575,7 +7576,7 @@ BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, int textByteLen)
|
||||
}
|
||||
|
||||
// Write the actual text
|
||||
if (!SaveBufferToFile ((char *) text, path, textByteLen, TRUE))
|
||||
if (!SaveBufferToFile ((char *) text, path, (DWORD) textByteLen, TRUE))
|
||||
{
|
||||
remove (path);
|
||||
return FALSE;
|
||||
@ -7965,7 +7966,7 @@ int GetDriverRefCount ()
|
||||
// processed by mputLong(). The result is stored in *result. Returns TRUE if successful (otherwise FALSE).
|
||||
BOOL LoadInt32 (char *filePath, unsigned __int32 *result, __int64 fileOffset)
|
||||
{
|
||||
size_t bufSize = sizeof(__int32);
|
||||
DWORD bufSize = sizeof(__int32);
|
||||
unsigned char *buffer = (unsigned char *) malloc (bufSize);
|
||||
unsigned char *bufferPtr = buffer;
|
||||
HANDLE src = NULL;
|
||||
@ -8009,7 +8010,7 @@ BOOL LoadInt32 (char *filePath, unsigned __int32 *result, __int64 fileOffset)
|
||||
// processed by mputWord(). The result is stored in *result. Returns TRUE if successful (otherwise FALSE).
|
||||
BOOL LoadInt16 (char *filePath, int *result, __int64 fileOffset)
|
||||
{
|
||||
size_t bufSize = sizeof(__int16);
|
||||
DWORD bufSize = sizeof(__int16);
|
||||
unsigned char *buffer = (unsigned char *) malloc (bufSize);
|
||||
unsigned char *bufferPtr = buffer;
|
||||
HANDLE src = NULL;
|
||||
@ -8085,7 +8086,7 @@ char *LoadFile (const char *fileName, DWORD *size)
|
||||
|
||||
|
||||
// Returns NULL if there's any error.
|
||||
char *LoadFileBlock (char *fileName, __int64 fileOffset, size_t count)
|
||||
char *LoadFileBlock (char *fileName, __int64 fileOffset, DWORD count)
|
||||
{
|
||||
char *buf;
|
||||
DWORD bytesRead = 0;
|
||||
@ -8511,7 +8512,7 @@ int AskMultiChoice (void *strings[], BOOL bBold, HWND hwnd)
|
||||
params.strings = &strings[0];
|
||||
params.bold = bBold;
|
||||
|
||||
return DialogBoxParamW (hInst,
|
||||
return (int) DialogBoxParamW (hInst,
|
||||
MAKEINTRESOURCEW (IDD_MULTI_CHOICE_DLG), hwnd,
|
||||
(DLGPROC) MultiChoiceDialogProc, (LPARAM) ¶ms);
|
||||
}
|
||||
@ -9765,7 +9766,7 @@ static BOOL CALLBACK NewSecurityTokenKeyfileDlgProc (HWND hwndDlg, UINT msg, WPA
|
||||
return 1;
|
||||
}
|
||||
|
||||
newParams->SlotId = ComboBox_GetItemData (GetDlgItem (hwndDlg, IDC_SELECTED_TOKEN), selectedToken);
|
||||
newParams->SlotId = (CK_SLOT_ID) ComboBox_GetItemData (GetDlgItem (hwndDlg, IDC_SELECTED_TOKEN), selectedToken);
|
||||
|
||||
wchar_t name[1024];
|
||||
if (GetWindowTextW (GetDlgItem (hwndDlg, IDC_TOKEN_KEYFILE_NAME), name, array_capacity (name)) != 0)
|
||||
@ -10028,7 +10029,7 @@ BOOL CALLBACK SecurityTokenKeyfileDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam
|
||||
|
||||
finally_do_arg (vector <byte> *, &keyfileData, { burn (&finally_arg->front(), finally_arg->size()); });
|
||||
|
||||
if (!SaveBufferToFile ((char *) &keyfileData.front(), keyfilePath, keyfileData.size(), FALSE))
|
||||
if (!SaveBufferToFile ((char *) &keyfileData.front(), keyfilePath, (DWORD) keyfileData.size(), FALSE))
|
||||
throw SystemException ();
|
||||
}
|
||||
|
||||
|
||||
@ -302,7 +302,7 @@ int GetAvailableRemovables ( HWND hComboBox , char *lpszRootPath );
|
||||
int IsSystemDevicePath (const char *path, HWND hwndDlg, BOOL bReliableRequired);
|
||||
int IsNonSysPartitionOnSysDrive (const char *path);
|
||||
BOOL CALLBACK RawDevicesDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
|
||||
BOOL TextInfoDialogBox (int nID);
|
||||
INT_PTR TextInfoDialogBox (int nID);
|
||||
BOOL CALLBACK TextInfoDialogBoxDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||
char * GetLegalNotices ();
|
||||
BOOL CALLBACK BenchmarkDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
|
||||
@ -346,13 +346,13 @@ int FileSystemAppearsEmpty (const char *devicePath);
|
||||
__int64 GetStatsFreeSpaceOnPartition (const char *devicePath, float *percent, __int64 *occupiedBytes, BOOL silent);
|
||||
__int64 GetDeviceSize (const char *devicePath);
|
||||
HANDLE DismountDrive (char *devName, char *devicePath);
|
||||
int64 FindString (const char *buf, const char *str, int64 bufLen, size_t strLen, int64 startOffset);
|
||||
int64 FindString (const char *buf, const char *str, int64 bufLen, int64 strLen, int64 startOffset);
|
||||
BOOL FileExists (const char *filePathPtr);
|
||||
__int64 FindStringInFile (const char *filePath, const char *str, int strLen);
|
||||
BOOL TCCopyFile (char *sourceFileName, char *destinationFile);
|
||||
BOOL SaveBufferToFile (const char *inputBuffer, const char *destinationFile, DWORD inputLength, BOOL bAppend);
|
||||
BOOL TCFlushFile (FILE *f);
|
||||
BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, int byteLen);
|
||||
BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, size_t byteLen);
|
||||
void GetSpeedString (unsigned __int64 speed, wchar_t *str, size_t cbStr);
|
||||
BOOL IsNonInstallMode ();
|
||||
BOOL DriverUnload ();
|
||||
@ -374,7 +374,7 @@ __int64 GetFileSize64 (const char *path);
|
||||
BOOL LoadInt16 (char *filePath, int *result, __int64 fileOffset);
|
||||
BOOL LoadInt32 (char *filePath, unsigned __int32 *result, __int64 fileOffset);
|
||||
char *LoadFile (const char *fileName, DWORD *size);
|
||||
char *LoadFileBlock (char *fileName, __int64 fileOffset, size_t count);
|
||||
char *LoadFileBlock (char *fileName, __int64 fileOffset, DWORD count);
|
||||
char *GetModPath (char *path, int maxSize);
|
||||
char *GetConfigPath (char *fileName);
|
||||
char *GetProgramConfigPath (char *fileName);
|
||||
|
||||
@ -362,7 +362,7 @@ BOOL CALLBACK LanguageDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
|
||||
if (len != 0 && len != ERROR_NO_UNICODE_TRANSLATION
|
||||
&& (!defaultLangFound || wcscmp (wattr, L"English") != 0))
|
||||
{
|
||||
int i = SendDlgItemMessageW (hwndDlg, IDC_LANGLIST, LB_ADDSTRING, 0, (LPARAM)wattr);
|
||||
int i = (int) SendDlgItemMessageW (hwndDlg, IDC_LANGLIST, LB_ADDSTRING, 0, (LPARAM)wattr);
|
||||
if (i >= 0)
|
||||
{
|
||||
int id;
|
||||
@ -441,11 +441,11 @@ BOOL CALLBACK LanguageDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
|
||||
|
||||
if (lw == IDOK || hw == LBN_DBLCLK)
|
||||
{
|
||||
int i = SendDlgItemMessage (hwndDlg, IDC_LANGLIST, LB_GETCURSEL, 0, 0);
|
||||
int i = (int) SendDlgItemMessage (hwndDlg, IDC_LANGLIST, LB_GETCURSEL, 0, 0);
|
||||
|
||||
if (i >= 0)
|
||||
{
|
||||
int id = SendDlgItemMessage (hwndDlg, IDC_LANGLIST, LB_GETITEMDATA, i, 0);
|
||||
int id = (int) SendDlgItemMessage (hwndDlg, IDC_LANGLIST, LB_GETITEMDATA, i, 0);
|
||||
|
||||
if (id != LB_ERR)
|
||||
{
|
||||
|
||||
@ -232,7 +232,7 @@ BOOL WriteLocalMachineRegistryString (char *subKey, char *name, char *str, BOOL
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ((status = RegSetValueEx (hkey, name, 0, expandable ? REG_EXPAND_SZ : REG_SZ, (BYTE *) str, strlen (str) + 1)) != ERROR_SUCCESS)
|
||||
if ((status = RegSetValueEx (hkey, name, 0, expandable ? REG_EXPAND_SZ : REG_SZ, (BYTE *) str, (DWORD) strlen (str) + 1)) != ERROR_SUCCESS)
|
||||
{
|
||||
RegCloseKey (hkey);
|
||||
SetLastError (status);
|
||||
@ -252,7 +252,7 @@ void WriteRegistryString (char *subKey, char *name, char *str)
|
||||
0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &disp) != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
RegSetValueEx (hkey, name, 0, REG_SZ, (BYTE *) str, strlen (str) + 1);
|
||||
RegSetValueEx (hkey, name, 0, REG_SZ, (BYTE *) str, (DWORD) strlen (str) + 1);
|
||||
RegCloseKey (hkey);
|
||||
}
|
||||
|
||||
|
||||
@ -132,8 +132,8 @@ namespace VeraCrypt
|
||||
{ CKA_CLASS, &dataClass, sizeof (dataClass) },
|
||||
{ CKA_TOKEN, &trueVal, sizeof (trueVal) },
|
||||
{ CKA_PRIVATE, &trueVal, sizeof (trueVal) },
|
||||
{ CKA_LABEL, (CK_UTF8CHAR *) name.c_str(), name.size() },
|
||||
{ CKA_VALUE, &keyfileData.front(), keyfileData.size() }
|
||||
{ CKA_LABEL, (CK_UTF8CHAR *) name.c_str(), (CK_ULONG) name.size() },
|
||||
{ CKA_VALUE, &keyfileData.front(), (CK_ULONG) keyfileData.size() }
|
||||
};
|
||||
|
||||
CK_OBJECT_HANDLE keyfileHandle;
|
||||
@ -420,7 +420,7 @@ namespace VeraCrypt
|
||||
else if (Sessions[slotId].UserLoggedIn)
|
||||
return;
|
||||
|
||||
CK_RV status = Pkcs11Functions->C_Login (Sessions[slotId].Handle, CKU_USER, (CK_CHAR_PTR) pin.c_str(), pin.size());
|
||||
CK_RV status = Pkcs11Functions->C_Login (Sessions[slotId].Handle, CKU_USER, (CK_CHAR_PTR) pin.c_str(), (CK_ULONG) pin.size());
|
||||
|
||||
if (status != CKR_OK)
|
||||
throw Pkcs11Exception (status);
|
||||
|
||||
@ -220,7 +220,7 @@ typedef int BOOL;
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#define burn(mem,size) do { volatile char *burnm = (volatile char *)(mem); int burnc = size; RtlSecureZeroMemory (mem, size); while (burnc--) *burnm++ = 0; } while (0)
|
||||
#define burn(mem,size) do { volatile char *burnm = (volatile char *)(mem); size_t burnc = size; RtlSecureZeroMemory (mem, size); while (burnc--) *burnm++ = 0; } while (0)
|
||||
#else
|
||||
#define burn(mem,size) do { volatile char *burnm = (volatile char *)(mem); int burnc = size; while (burnc--) *burnm++ = 0; } while (0)
|
||||
#endif
|
||||
|
||||
@ -2003,7 +2003,7 @@ BOOL SaveNonSysInPlaceEncSettings (int delta, WipeAlgorithmId newWipeAlgorithm,
|
||||
{
|
||||
StringCbPrintfA (str, sizeof(str), "%d", (int) newWipeAlgorithm);
|
||||
|
||||
SaveBufferToFile (str, GetConfigPath (TC_APPD_FILENAME_NONSYS_INPLACE_ENC_WIPE), strlen(str), FALSE);
|
||||
SaveBufferToFile (str, GetConfigPath (TC_APPD_FILENAME_NONSYS_INPLACE_ENC_WIPE), (DWORD) strlen(str), FALSE);
|
||||
}
|
||||
else if (FileExists (GetConfigPath (TC_APPD_FILENAME_NONSYS_INPLACE_ENC_WIPE)))
|
||||
{
|
||||
@ -2013,7 +2013,7 @@ BOOL SaveNonSysInPlaceEncSettings (int delta, WipeAlgorithmId newWipeAlgorithm,
|
||||
|
||||
StringCbPrintfA (str, sizeof(str), "%d", count);
|
||||
|
||||
return SaveBufferToFile (str, GetConfigPath (TC_APPD_FILENAME_NONSYS_INPLACE_ENC), strlen(str), FALSE);
|
||||
return SaveBufferToFile (str, GetConfigPath (TC_APPD_FILENAME_NONSYS_INPLACE_ENC), (DWORD) strlen(str), FALSE);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1295,7 +1295,7 @@ __int64 GetSystemPartitionSize (void)
|
||||
|
||||
void ComboSelChangeEA (HWND hwndDlg)
|
||||
{
|
||||
LPARAM nIndex = SendMessage (GetDlgItem (hwndDlg, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0);
|
||||
int nIndex = (int) SendMessage (GetDlgItem (hwndDlg, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0);
|
||||
|
||||
if (nIndex == CB_ERR)
|
||||
{
|
||||
@ -1309,7 +1309,7 @@ void ComboSelChangeEA (HWND hwndDlg)
|
||||
int cipherIDs[5];
|
||||
int i, cnt = 0;
|
||||
|
||||
nIndex = SendMessage (GetDlgItem (hwndDlg, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
nIndex = (int) SendMessage (GetDlgItem (hwndDlg, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
EAGetName (name, nIndex, 0);
|
||||
|
||||
if (strcmp (name, "AES") == 0)
|
||||
@ -1383,12 +1383,12 @@ static void VerifySizeAndUpdate (HWND hwndDlg, BOOL bUpdate)
|
||||
BOOL bEnable = TRUE;
|
||||
char szTmp[50];
|
||||
__int64 lTmp;
|
||||
size_t i;
|
||||
int i;
|
||||
static unsigned __int64 nLastVolumeSize = 0;
|
||||
|
||||
GetWindowText (GetDlgItem (hwndDlg, IDC_SIZEBOX), szTmp, sizeof (szTmp));
|
||||
|
||||
for (i = 0; i < strlen (szTmp); i++)
|
||||
for (i = 0; i < (int) strlen (szTmp); i++)
|
||||
{
|
||||
if (szTmp[i] >= '0' && szTmp[i] <= '9')
|
||||
continue;
|
||||
@ -3111,7 +3111,7 @@ void DisplaySizingErrorText (HWND hwndTextBox)
|
||||
|
||||
void EnableDisableFileNext (HWND hComboBox, HWND hMainButton)
|
||||
{
|
||||
LPARAM nIndex = SendMessage (hComboBox, CB_GETCURSEL, 0, 0);
|
||||
int nIndex = (int) SendMessage (hComboBox, CB_GETCURSEL, 0, 0);
|
||||
if (bHistory && nIndex == CB_ERR)
|
||||
{
|
||||
EnableWindow (hMainButton, FALSE);
|
||||
@ -4046,12 +4046,12 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
|
||||
SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
|
||||
|
||||
nIndex = SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
nIndex = (int) SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) 0);
|
||||
|
||||
for (i = FIRST_PRF_ID; i <= LAST_PRF_ID; i++)
|
||||
{
|
||||
nIndex = SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
nIndex = (int) SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) i);
|
||||
}
|
||||
|
||||
@ -4163,7 +4163,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
NULL,
|
||||
NULL,
|
||||
KeyFilesEnable && FirstKeyFile!=NULL && !SysEncInEffect());
|
||||
volumePassword.Length = strlen ((char *) volumePassword.Text);
|
||||
volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -5177,7 +5177,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
int c;
|
||||
|
||||
nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0);
|
||||
nVolumeEA = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
nVolumeEA = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
|
||||
for (c = EAGetLastCipher (nVolumeEA); c != 0; c = EAGetPreviousCipher (nVolumeEA, c))
|
||||
{
|
||||
@ -5207,8 +5207,8 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
{
|
||||
char name[100];
|
||||
|
||||
int nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0);
|
||||
nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
int nIndex = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0);
|
||||
nIndex = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
EAGetName (name, nIndex, 0);
|
||||
|
||||
if (strcmp (name, "AES") == 0)
|
||||
@ -5272,7 +5272,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
NULL,
|
||||
NULL,
|
||||
KeyFilesEnable && FirstKeyFile!=NULL && !SysEncInEffect());
|
||||
volumePassword.Length = strlen ((char *) volumePassword.Text);
|
||||
volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -5356,7 +5356,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
if (hw == EN_CHANGE)
|
||||
{
|
||||
GetWindowText (GetDlgItem (hCurPage, IDC_PASSWORD_DIRECT), (char *) volumePassword.Text, sizeof (volumePassword.Text));
|
||||
volumePassword.Length = strlen ((char *) volumePassword.Text);
|
||||
volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -5427,7 +5427,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
// Select device
|
||||
RawDevicesDlgParam param;
|
||||
param.pszFileName = szFileName;
|
||||
int nResult = DialogBoxParamW (hInst,
|
||||
INT_PTR nResult = DialogBoxParamW (hInst,
|
||||
MAKEINTRESOURCEW (IDD_RAWDEVICES_DLG), GetParent (hwndDlg),
|
||||
(DLGPROC) RawDevicesDlgProc, (LPARAM) & param);
|
||||
|
||||
@ -5493,7 +5493,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
if (SysEncInEffect ())
|
||||
{
|
||||
HWND hHashAlgoItem = GetDlgItem (hwndDlg, IDC_COMBO_BOX_HASH_ALGO);
|
||||
LRESULT selectedAlgo = SendMessage (hHashAlgoItem, CB_GETITEMDATA, SendMessage (hHashAlgoItem, CB_GETCURSEL, 0, 0), 0);
|
||||
int selectedAlgo = (int) SendMessage (hHashAlgoItem, CB_GETITEMDATA, SendMessage (hHashAlgoItem, CB_GETCURSEL, 0, 0), 0);
|
||||
if (!HashForSystemEncryption(selectedAlgo))
|
||||
{
|
||||
hash_algo = DEFAULT_HASH_ALGORITHM_BOOT;
|
||||
@ -5525,7 +5525,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
|
||||
if (lw == IDC_FILESYS && hw == CBN_SELCHANGE)
|
||||
{
|
||||
fileSystem = SendMessage (GetDlgItem (hCurPage, IDC_FILESYS), CB_GETITEMDATA,
|
||||
fileSystem = (int) SendMessage (GetDlgItem (hCurPage, IDC_FILESYS), CB_GETITEMDATA,
|
||||
SendMessage (GetDlgItem (hCurPage, IDC_FILESYS), CB_GETCURSEL, 0, 0) , 0);
|
||||
|
||||
return 1;
|
||||
@ -6860,7 +6860,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
{
|
||||
LPARAM nIndex;
|
||||
nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0);
|
||||
nVolumeEA = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
nVolumeEA = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
|
||||
if (SysEncInEffect ()
|
||||
&& EAGetCipherCount (nVolumeEA) > 1) // Cascade?
|
||||
@ -6873,7 +6873,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
}
|
||||
|
||||
nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETCURSEL, 0, 0);
|
||||
hash_algo = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETITEMDATA, nIndex, 0);
|
||||
hash_algo = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETITEMDATA, nIndex, 0);
|
||||
|
||||
RandSetHashFunction (hash_algo);
|
||||
|
||||
@ -6939,7 +6939,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
szVerify,
|
||||
KeyFilesEnable && FirstKeyFile!=NULL && !SysEncInEffect());
|
||||
|
||||
volumePassword.Length = strlen ((char *) volumePassword.Text);
|
||||
volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text);
|
||||
|
||||
if (volumePassword.Length > 0)
|
||||
{
|
||||
@ -7009,7 +7009,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
WaitCursor ();
|
||||
|
||||
GetWindowText (GetDlgItem (hCurPage, IDC_PASSWORD_DIRECT), (char *) volumePassword.Text, sizeof (volumePassword.Text));
|
||||
volumePassword.Length = strlen ((char *) volumePassword.Text);
|
||||
volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text);
|
||||
|
||||
hash_algo = (int) SendMessage (GetDlgItem (hCurPage, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, SendMessage (GetDlgItem (hCurPage, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
|
||||
|
||||
@ -7671,10 +7671,10 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
|
||||
bVolTransformThreadToRun = TRUE;
|
||||
|
||||
fileSystem = SendMessage (GetDlgItem (hCurPage, IDC_FILESYS), CB_GETITEMDATA,
|
||||
fileSystem = (int) SendMessage (GetDlgItem (hCurPage, IDC_FILESYS), CB_GETITEMDATA,
|
||||
SendMessage (GetDlgItem (hCurPage, IDC_FILESYS), CB_GETCURSEL, 0, 0) , 0);
|
||||
|
||||
clusterSize = SendMessage (GetDlgItem (hCurPage, IDC_CLUSTERSIZE), CB_GETITEMDATA,
|
||||
clusterSize = (int) SendMessage (GetDlgItem (hCurPage, IDC_CLUSTERSIZE), CB_GETITEMDATA,
|
||||
SendMessage (GetDlgItem (hCurPage, IDC_CLUSTERSIZE), CB_GETCURSEL, 0, 0) , 0);
|
||||
|
||||
quickFormat = IsButtonChecked (GetDlgItem (hCurPage, IDC_QUICKFORMAT));
|
||||
@ -8049,10 +8049,10 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
{
|
||||
LPARAM nIndex;
|
||||
nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0);
|
||||
nVolumeEA = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
nVolumeEA = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0);
|
||||
|
||||
nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETCURSEL, 0, 0);
|
||||
hash_algo = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETITEMDATA, nIndex, 0);
|
||||
hash_algo = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETITEMDATA, nIndex, 0);
|
||||
|
||||
RandSetHashFunction (hash_algo);
|
||||
|
||||
@ -8094,7 +8094,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
szVerify,
|
||||
KeyFilesEnable && FirstKeyFile!=NULL && !SysEncInEffect ());
|
||||
|
||||
volumePassword.Length = strlen ((char *) volumePassword.Text);
|
||||
volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text);
|
||||
|
||||
nNewPageNo = SIZE_PAGE + 1; // Skip the hidden volume host password page
|
||||
|
||||
@ -8124,7 +8124,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
GetWindowText (GetDlgItem (hCurPage, IDC_PASSWORD_DIRECT), szRawPassword, sizeof (szRawPassword));
|
||||
|
||||
GetWindowText (GetDlgItem (hCurPage, IDC_PASSWORD_DIRECT), (char *) volumePassword.Text, sizeof (volumePassword.Text));
|
||||
volumePassword.Length = strlen ((char *) volumePassword.Text);
|
||||
volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text);
|
||||
|
||||
if (!bInPlaceEncNonSys)
|
||||
nNewPageNo = VOLUME_LOCATION_PAGE + 1;
|
||||
|
||||
@ -308,7 +308,7 @@ static void InitMainDialog (HWND hwndDlg)
|
||||
info.fMask = MIIM_TYPE;
|
||||
info.fType = MFT_STRING;
|
||||
info.dwTypeData = str;
|
||||
info.cch = wcslen (str);
|
||||
info.cch = (UINT) wcslen (str);
|
||||
|
||||
SetMenuItemInfoW (GetMenu (hwndDlg), i, FALSE, &info);
|
||||
}
|
||||
@ -329,7 +329,7 @@ static void InitMainDialog (HWND hwndDlg)
|
||||
FavoriteVolumesMenu = GetSubMenu (GetMenu (hwndDlg), i);
|
||||
|
||||
info.dwTypeData = str;
|
||||
info.cch = wcslen (str);
|
||||
info.cch = (UINT) wcslen (str);
|
||||
|
||||
SetMenuItemInfoW (GetMenu (hwndDlg), i, TRUE, &info);
|
||||
}
|
||||
@ -2128,7 +2128,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
|
||||
case IDC_PKCS5_PRF_ID:
|
||||
if (bSysEncPwdChangeDlgMode)
|
||||
{
|
||||
int new_hash_algo_id = SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
|
||||
int new_hash_algo_id = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
|
||||
|
||||
if (new_hash_algo_id != 0 && !HashForSystemEncryption(new_hash_algo_id))
|
||||
@ -2180,9 +2180,9 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_WIPE_MODE), CB_GETCURSEL, 0, 0),
|
||||
0);
|
||||
int nStatus;
|
||||
int old_pkcs5 = SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), CB_GETITEMDATA,
|
||||
int old_pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), CB_GETITEMDATA,
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), CB_GETCURSEL, 0, 0), 0);
|
||||
int pkcs5 = SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
|
||||
int pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
|
||||
BOOL truecryptMode = GetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE);
|
||||
|
||||
@ -2212,7 +2212,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
|
||||
GetWindowText (GetDlgItem (hParent, IDC_VOLUME), szFileName, sizeof (szFileName));
|
||||
|
||||
GetWindowText (GetDlgItem (hwndDlg, IDC_OLD_PASSWORD), (LPSTR) oldPassword.Text, sizeof (oldPassword.Text));
|
||||
oldPassword.Length = strlen ((char *) oldPassword.Text);
|
||||
oldPassword.Length = (unsigned __int32) strlen ((char *) oldPassword.Text);
|
||||
|
||||
switch (pwdChangeDlgMode)
|
||||
{
|
||||
@ -2220,12 +2220,12 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
|
||||
case PCDM_ADD_REMOVE_VOL_KEYFILES:
|
||||
case PCDM_CHANGE_PKCS5_PRF:
|
||||
memcpy (newPassword.Text, oldPassword.Text, sizeof (newPassword.Text));
|
||||
newPassword.Length = strlen ((char *) oldPassword.Text);
|
||||
newPassword.Length = (unsigned __int32) strlen ((char *) oldPassword.Text);
|
||||
break;
|
||||
|
||||
default:
|
||||
GetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD), (LPSTR) newPassword.Text, sizeof (newPassword.Text));
|
||||
newPassword.Length = strlen ((char *) newPassword.Text);
|
||||
newPassword.Length = (unsigned __int32) strlen ((char *) newPassword.Text);
|
||||
}
|
||||
|
||||
WaitCursor ();
|
||||
@ -2340,12 +2340,12 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
|
||||
HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
|
||||
SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
|
||||
|
||||
nIndex = SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
nIndex = (int) SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) 0);
|
||||
|
||||
for (i = FIRST_PRF_ID; i <= LAST_PRF_ID; i++)
|
||||
{
|
||||
nIndex = SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
nIndex = (int) SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) i);
|
||||
if (*pkcs5 && (*pkcs5 == i))
|
||||
defaultPrfIndex = nIndex;
|
||||
@ -2404,14 +2404,14 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
|
||||
HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
|
||||
SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
|
||||
|
||||
int i, defaultPrfIndex = 0, nIndex = SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
int i, defaultPrfIndex = 0, nIndex = (int) SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) 0);
|
||||
|
||||
for (i = FIRST_PRF_ID; i <= LAST_PRF_ID; i++)
|
||||
{
|
||||
if (HashForSystemEncryption(i))
|
||||
{
|
||||
nIndex = SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
nIndex = (int) SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) i);
|
||||
if (*pkcs5 && (*pkcs5 == i))
|
||||
defaultPrfIndex = nIndex;
|
||||
@ -2560,7 +2560,7 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
|
||||
KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile);
|
||||
|
||||
GetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD), (LPSTR) szXPwd->Text, MAX_PASSWORD + 1);
|
||||
szXPwd->Length = strlen ((char *) szXPwd->Text);
|
||||
szXPwd->Length = (unsigned __int32) strlen ((char *) szXPwd->Text);
|
||||
|
||||
bCacheInDriver = IsButtonChecked (GetDlgItem (hwndDlg, IDC_CACHE));
|
||||
*pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
|
||||
@ -2929,12 +2929,12 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
|
||||
HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
|
||||
SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
|
||||
|
||||
int i, nSelectedIndex = 0, nIndex = SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
int i, nSelectedIndex = 0, nIndex = (int) SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) 0);
|
||||
|
||||
for (i = FIRST_PRF_ID; i <= LAST_PRF_ID; i++)
|
||||
{
|
||||
nIndex = SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
nIndex = (int) SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) i);
|
||||
/* if a PRF was selected previously, select it */
|
||||
if (i == mountOptions->ProtectedHidVolPkcs5Prf)
|
||||
@ -3051,9 +3051,9 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
|
||||
(LPSTR) mountOptions->ProtectedHidVolPassword.Text,
|
||||
sizeof (mountOptions->ProtectedHidVolPassword.Text));
|
||||
|
||||
mountOptions->ProtectedHidVolPassword.Length = strlen ((char *) mountOptions->ProtectedHidVolPassword.Text);
|
||||
mountOptions->ProtectedHidVolPassword.Length = (unsigned __int32) strlen ((char *) mountOptions->ProtectedHidVolPassword.Text);
|
||||
|
||||
mountOptions->ProtectedHidVolPkcs5Prf = SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
|
||||
mountOptions->ProtectedHidVolPkcs5Prf = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
|
||||
}
|
||||
|
||||
@ -3516,13 +3516,13 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
|
||||
|
||||
SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_RESETCONTENT, 0, 0);
|
||||
|
||||
index = SendDlgItemMessageW (hwndDlg, IDC_DRIVELIST, CB_ADDSTRING, 0, (LPARAM) GetString ("FIRST_AVAILABLE"));
|
||||
index = (int) SendDlgItemMessageW (hwndDlg, IDC_DRIVELIST, CB_ADDSTRING, 0, (LPARAM) GetString ("FIRST_AVAILABLE"));
|
||||
SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_SETITEMDATA, index, (LPARAM) 0);
|
||||
|
||||
for (i = 'D'; i <= 'Z'; i++)
|
||||
{
|
||||
drive[0] = i;
|
||||
index = SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_ADDSTRING, 0, (LPARAM) drive);
|
||||
index = (int) SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_ADDSTRING, 0, (LPARAM) drive);
|
||||
SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_SETITEMDATA, index, (LPARAM) i);
|
||||
}
|
||||
|
||||
@ -3606,8 +3606,8 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
|
||||
volName[0] = 0;
|
||||
GetDlgItemText (hwndDlg, IDC_VOLUME_NAME, volName + 1, (sizeof volName) - 1);
|
||||
|
||||
drive = SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_GETCURSEL, 0, 0);
|
||||
drive = SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_GETITEMDATA, drive, 0);
|
||||
drive = (int) SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_GETCURSEL, 0, 0);
|
||||
drive = (int) SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_GETITEMDATA, drive, 0);
|
||||
|
||||
copyWizard = IsButtonChecked (GetDlgItem (hwndDlg, IDC_COPY_WIZARD));
|
||||
bExplore = IsButtonChecked (GetDlgItem (hwndDlg, IDC_TRAVEL_OPEN_EXPLORER));
|
||||
@ -3867,7 +3867,7 @@ LPARAM GetItemLong (HWND hTree, int itemNo)
|
||||
|
||||
static int AskVolumePassword (HWND hwndDlg, Password *password, int *pkcs5, BOOL* truecryptMode, char *titleStringId, BOOL enableMountOptions)
|
||||
{
|
||||
int result;
|
||||
INT_PTR result;
|
||||
PasswordDlgParam dlgParam;
|
||||
|
||||
PasswordDialogTitleStringId = titleStringId;
|
||||
@ -4511,7 +4511,7 @@ static BOOL MountAllDevices (HWND hwndDlg, BOOL bPasswordPrompt)
|
||||
|
||||
static void ChangePassword (HWND hwndDlg)
|
||||
{
|
||||
int result;
|
||||
INT_PTR result;
|
||||
|
||||
GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), szFileName, sizeof (szFileName));
|
||||
if (IsMountedVolume (szFileName))
|
||||
@ -5110,7 +5110,7 @@ BOOL SelectPartition (HWND hwndDlg)
|
||||
{
|
||||
RawDevicesDlgParam param;
|
||||
param.pszFileName = szFileName;
|
||||
int nResult = DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_RAWDEVICES_DLG), hwndDlg,
|
||||
INT_PTR nResult = DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_RAWDEVICES_DLG), hwndDlg,
|
||||
(DLGPROC) RawDevicesDlgProc, (LPARAM) & param);
|
||||
if (nResult == IDOK)
|
||||
{
|
||||
@ -5665,7 +5665,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
COPYDATASTRUCT cd;
|
||||
memcpy (&cd.dwData, WM_COPY_SET_VOLUME_NAME, 4);
|
||||
cd.lpData = szFileName;
|
||||
cd.cbData = strlen (szFileName) + 1;
|
||||
cd.cbData = (DWORD) strlen (szFileName) + 1;
|
||||
|
||||
SendMessage (h, WM_COPYDATA, (WPARAM)hwndDlg, (LPARAM)&cd);
|
||||
}
|
||||
@ -6231,7 +6231,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
/* Double click within drive list */
|
||||
if (((LPNMHDR) lParam)->code == LVN_ITEMACTIVATE)
|
||||
{
|
||||
int state = GetItemLong (GetDlgItem (hwndDlg, IDC_DRIVELIST), ((LPNMITEMACTIVATE)lParam)->iItem );
|
||||
LPARAM state = GetItemLong (GetDlgItem (hwndDlg, IDC_DRIVELIST), ((LPNMITEMACTIVATE)lParam)->iItem );
|
||||
nSelectedDriveIndex = ((LPNMITEMACTIVATE)lParam)->iItem;
|
||||
if (LOWORD(state) == TC_MLIST_ITEM_NONSYS_VOL || LOWORD(state) == TC_MLIST_ITEM_SYS_PARTITION)
|
||||
{
|
||||
@ -6373,7 +6373,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
||||
|
||||
case IDPM_OPEN_VOLUME:
|
||||
{
|
||||
int state = GetItemLong(GetDlgItem (hwndDlg, IDC_DRIVELIST), ((LPNMITEMACTIVATE)lParam)->iItem );
|
||||
LPARAM state = GetItemLong(GetDlgItem (hwndDlg, IDC_DRIVELIST), ((LPNMITEMACTIVATE)lParam)->iItem );
|
||||
nSelectedDriveIndex = ((LPNMITEMACTIVATE)lParam)->iItem;
|
||||
|
||||
WaitCursor ();
|
||||
@ -7588,7 +7588,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
|
||||
if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs, &i, nNoCommandLineArgs,
|
||||
(char *) CmdVolumePassword.Text, sizeof (CmdVolumePassword.Text)))
|
||||
{
|
||||
CmdVolumePassword.Length = strlen ((char *) CmdVolumePassword.Text);
|
||||
CmdVolumePassword.Length = (unsigned __int32) strlen ((char *) CmdVolumePassword.Text);
|
||||
CmdVolumePasswordValid = TRUE;
|
||||
}
|
||||
else
|
||||
@ -9367,12 +9367,12 @@ static BOOL CALLBACK DefaultMountParametersDlgProc (HWND hwndDlg, UINT msg, WPAR
|
||||
HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
|
||||
SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
|
||||
|
||||
nIndex = SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
nIndex = (int) SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) GetString ("AUTODETECTION"));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) 0);
|
||||
|
||||
for (i = FIRST_PRF_ID; i <= LAST_PRF_ID; i++)
|
||||
{
|
||||
nIndex = SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
nIndex = (int) SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
|
||||
SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) i);
|
||||
if (DefaultVolumePkcs5 && (DefaultVolumePkcs5 == i))
|
||||
defaultPrfIndex = nIndex;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user