1 files changed, 70 insertions, 1 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index e471fc46..6c98b4d7 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -851,40 +851,109 @@ BOOL TCCopyFile (wchar_t *sourceFileName, wchar_t *destinationFile)
 	src = CreateFileW (sourceFileName,
 		GENERIC_READ,
 		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
 
 	if (src == INVALID_HANDLE_VALUE)
 		return FALSE;
 
 	dst = CreateFileW (destinationFile,
 		GENERIC_WRITE,
 		0, NULL, CREATE_ALWAYS, 0, NULL);
 
 	if (dst == INVALID_HANDLE_VALUE)
 	{
 		CloseHandle (src);
 		return FALSE;
 	}
 
 	return TCCopyFileBase (src, dst);
 }
 
+#if !defined(_WIN64) && defined(NDEBUG) && !defined (VC_SKIP_OS_DRIVER_REQ_CHECK)
+// in 32-bit build, Crypto project is not compiled so we need to provide this function here
+
+#pragma comment(lib, "bcrypt.lib")
+
+void sha512(unsigned char* result, const unsigned char* source, uint64_t sourceLen)
+{
+	BCRYPT_ALG_HANDLE   hAlg = NULL;
+	BCRYPT_HASH_HANDLE  hHash = NULL;
+	NTSTATUS            status = 0;
+
+	// Open an algorithm provider for SHA512.
+	status = BCryptOpenAlgorithmProvider(
+		&hAlg,
+		BCRYPT_SHA512_ALGORITHM,
+		NULL,
+		0);
+	if (!BCRYPT_SUCCESS(status))
+	{
+		goto cleanup;
+	}
+
+	// Create a hash handle.
+	status = BCryptCreateHash(
+		hAlg,
+		&hHash,
+		NULL,
+		0,
+		NULL,   // Optional secret, not needed for SHA512
+		0,
+		0);
+	if (!BCRYPT_SUCCESS(status))
+	{
+		goto cleanup;
+	}
+
+	// Hash the data. Note: BCryptHashData takes an ULONG for the length.
+	status = BCryptHashData(
+		hHash,
+		(PUCHAR)source,
+		(ULONG)sourceLen,
+		0);
+	if (!BCRYPT_SUCCESS(status))
+	{
+		goto cleanup;
+	}
+
+	// Finalize the hash computation and write the result.
+	status = BCryptFinishHash(
+		hHash,
+		result,
+		SHA512_DIGESTSIZE,
+		0);
+	if (!BCRYPT_SUCCESS(status))
+	{
+		goto cleanup;
+	}
+
+cleanup:
+	if (hHash)
+	{
+		BCryptDestroyHash(hHash);
+	}
+	if (hAlg)
+	{
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+	}
+}
+#endif
 
 BOOL VerifyModuleSignature (const wchar_t* path)
 {
 #if defined(NDEBUG) && !defined (VC_SKIP_OS_DRIVER_REQ_CHECK)
 	BOOL bResult = FALSE;
 	HRESULT hResult;
 	GUID gActionID = WINTRUST_ACTION_GENERIC_VERIFY_V2;
 	WINTRUST_FILE_INFO  fileInfo = {0};
 	WINTRUST_DATA      WVTData = {0};
 	wchar_t filePath [TC_MAX_PATH + 1024];
 
 	// Strip quotation marks (if any)
 	if (path [0] == L'"')
 	{
 		StringCbCopyW (filePath, sizeof(filePath), path + 1);
 	}
 	else
 	{
 		StringCbCopyW (filePath, sizeof(filePath), path);
 	}
@@ -8203,41 +8272,41 @@ int DriverUnmountVolume (HWND hwndDlg, int nDosDriveNo, BOOL forced)
 	DWORD dwResult;
 	VOLUME_PROPERTIES_STRUCT prop;
 	BOOL bResult;
 	WCHAR wszLabel[33] = {0};
 	BOOL bDriverSetLabel = FALSE;
 
 	memset (&prop, 0, sizeof(prop));
 	prop.driveNo = nDosDriveNo;
 
 	if (	DeviceIoControl (hDriver, TC_IOCTL_GET_VOLUME_PROPERTIES, &prop, sizeof (prop), &prop, sizeof (prop), &dwResult, NULL)
 		&&	prop.driveNo == nDosDriveNo
 		)
 	{
 		memcpy (wszLabel, prop.wszLabel, sizeof (wszLabel));
 		bDriverSetLabel = prop.bDriverSetLabel;
 	}
 	
 	unmount.nDosDriveNo = nDosDriveNo;
 	unmount.ignoreOpenFiles = forced;
 
-	bResult = DeviceIoControl (hDriver, TC_IOCTL_DISMOUNT_VOLUME, &unmount,
+	bResult = DeviceIoControl (hDriver, TC_IOCTL_UNMOUNT_VOLUME, &unmount,
 			sizeof (unmount), &unmount, sizeof (unmount), &dwResult, NULL);
 
 	if (bResult == FALSE)
 	{
 		handleWin32Error (hwndDlg, SRC_POS);
 		return 1;
 	}
 	else if ((unmount.nReturnCode == ERR_SUCCESS) && bDriverSetLabel && wszLabel[0])
 		UpdateDriveCustomLabel (nDosDriveNo, wszLabel, FALSE);
 
 #ifdef TCMOUNT
 
 	if (unmount.nReturnCode == ERR_SUCCESS
 		&& unmount.HiddenVolumeProtectionTriggered
 		&& !VolumeNotificationsList.bHidVolDamagePrevReported [nDosDriveNo]
 		&& !Silent)
 	{
 		wchar_t msg[4096];
 
 		VolumeNotificationsList.bHidVolDamagePrevReported [nDosDriveNo] = TRUE;