diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2020-08-06 18:17:27 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2020-08-06 18:48:52 +0200 |
| commit | cb7fb0a46a8f8bdff817a03ab5059290b6315fb9 (patch) | |
| tree | a5346b9539cddae2cbc5447cd466ad37621838ef /src/Format | |
| parent | f3bc81dc70794f7bc9ddb1607733cb4dfe315eec (diff) | |
| download | VeraCrypt-cb7fb0a46a8f8bdff817a03ab5059290b6315fb9.tar.gz VeraCrypt-cb7fb0a46a8f8bdff817a03ab5059290b6315fb9.zip | |
Windows: Fix crash when using portable 32-bit "VeraCrypt Format.exe"/"VeraCrypt.exe" on a 64-bit machine where VeraCrypt is already installed
Diffstat (limited to 'src/Format')
| -rw-r--r-- | src/Format/FormatCom.cpp | 4 | ||||
| -rw-r--r-- | src/Format/FormatCom.idl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Format/FormatCom.cpp b/src/Format/FormatCom.cpp index 4acf7a3e..7c155600 100644 --- a/src/Format/FormatCom.cpp +++ b/src/Format/FormatCom.cpp @@ -96,7 +96,7 @@ public: } virtual int STDMETHODCALLTYPE AnalyzeHiddenVolumeHost ( - LONG_PTR hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters) + __int64 hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters) { return ::AnalyzeHiddenVolumeHost ( (HWND) hwndDlg, driveNo, hiddenVolHostSize, realClusterSize, nbrFreeClusters); @@ -283,7 +283,7 @@ extern "C" int UacAnalyzeHiddenVolumeHost (HWND hwndDlg, int *driveNo, __int64 h CoInitialize (NULL); if (ComGetInstance (hwndDlg, &tc)) - r = tc->AnalyzeHiddenVolumeHost ((LONG_PTR) hwndDlg, driveNo, hiddenVolHostSize, realClusterSize, nbrFreeClusters); + r = tc->AnalyzeHiddenVolumeHost ((__int64) hwndDlg, driveNo, hiddenVolHostSize, realClusterSize, nbrFreeClusters); else r = 0; diff --git a/src/Format/FormatCom.idl b/src/Format/FormatCom.idl index e5135191..9df43f6e 100644 --- a/src/Format/FormatCom.idl +++ b/src/Format/FormatCom.idl @@ -16,7 +16,7 @@ import "..\Common\Password.h"; [ uuid(56327DDA-F1A7-4e13-B128-520D129BDEF6), helpstring("VeraCrypt Format UAC Support Library"), - version(2.8) // Update ComSetup.cpp when changing version number + version(2.9) // Update ComSetup.cpp when changing version number ] library TrueCryptFormatCom { @@ -28,7 +28,7 @@ library TrueCryptFormatCom ] interface ITrueCryptFormatCom : IUnknown { - int AnalyzeHiddenVolumeHost (LONG_PTR hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters); + int AnalyzeHiddenVolumeHost (__int64 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); |