Windows: in case of mounting system favorites, call driver to get list of drives instead of using SetupAPI in order to fix some rare issues where some disks were not detected at boot.

author: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2017-07-19 11:25:25 +0200
committer: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2017-07-20 23:23:16 +0200
commit: fe26ed8a5d224b133c48e2846b851d585460ad30 (patch)
tree: b62288613dd14f293dc1cd818122cba51a50709a /src/Common
parent: d78a3d02737d230e30139498125415444f65e78c (diff)
download: VeraCrypt-fe26ed8a5d224b133c48e2846b851d585460ad30.tar.gz
VeraCrypt-fe26ed8a5d224b133c48e2846b851d585460ad30.zip
2 files changed, 96 insertions, 77 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 702ba4e9..08bdbc84 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -11866,8 +11866,11 @@ void AddDeviceToList (std::vector<HostDevice>& devices, int devNumber, int partN
 	devices.push_back (device);
 }
 
-std::vector <HostDevice> GetHostRawDeviceList ()
+std::vector <HostDevice> GetHostRawDeviceList (bool bFromService)
 {
+	if (bFromService)
+		return GetAvailableHostDevices (true, false, true, true);
+
 	std::vector <HostDevice> list;
 	HDEVINFO diskClassDevices;
 	GUID diskClassDeviceInterfaceGuid = GUID_DEVINTERFACE_DISK;
@@ -11980,7 +11983,7 @@ bool CompareDeviceList (const std::vector<HostDevice>& list1, const std::vector<
 	return true;
 }
 
-void UpdateMountableHostDeviceList ()
+void UpdateMountableHostDeviceList (bool bFromService)
 {
 	ByteArray buffer(4096);
 	DWORD bytesReturned;
@@ -11989,7 +11992,7 @@ void UpdateMountableHostDeviceList ()
 	EnterCriticalSection (&csMountableDevices);
 	finally_do ({ LeaveCriticalSection (&csMountableDevices); });
 
-	std::vector<HostDevice> newList = GetHostRawDeviceList ();
+	std::vector<HostDevice> newList = GetHostRawDeviceList (bFromService);
 	std::map<DWORD, bool> existingDevicesMap;
 
 	if (CompareDeviceList (newList, rawHostDeviceList))
@@ -12032,104 +12035,120 @@ void UpdateMountableHostDeviceList ()
 		if (existingDevicesMap[It->SystemNumber])
 			continue;
 
-		HANDLE disk = CreateFile( It->Path.c_str(),
-			0,
-			FILE_SHARE_READ | FILE_SHARE_WRITE,
-			NULL,
-			OPEN_EXISTING,
-			0,
-			NULL );
-		if ( INVALID_HANDLE_VALUE != disk)
-		{	
-			bool bIsDynamic = false;
-			bool bHasPartition = false;
-			if (DeviceIoControl(
-				disk,
-				IOCTL_DISK_GET_DRIVE_LAYOUT_EX,
+		if (bFromService)
+		{
+			if (It->Partitions.empty())
+				mountableDevices.push_back (*It);
+			else
+			{
+				for (std::vector<HostDevice>::iterator partIt = It->Partitions.begin(); partIt != It->Partitions.end(); partIt++)
+				{
+					if (!partIt->ContainsSystem && !partIt->HasUnencryptedFilesystem)
+						mountableDevices.push_back (*partIt);
+				}
+			}
+		}
+		else
+		{
+			HANDLE disk = CreateFile( It->Path.c_str(),
+				0,
+				FILE_SHARE_READ | FILE_SHARE_WRITE,
 				NULL,
+				OPEN_EXISTING,
 				0,
-				(LPVOID) buffer.data(),
-				(DWORD) buffer.size(),
-				(LPDWORD) &bytesReturned,
-				NULL) && (bytesReturned >= sizeof (DRIVE_LAYOUT_INFORMATION_EX)))
-			{
-				PDRIVE_LAYOUT_INFORMATION_EX layout = (PDRIVE_LAYOUT_INFORMATION_EX) buffer.data();
-				// sanity checks
-				if (layout->PartitionCount <= 256)
+				NULL );
+			if ( INVALID_HANDLE_VALUE != disk)
+			{	
+				bool bIsDynamic = false;
+				bool bHasPartition = false;
+				if (DeviceIoControl(
+					disk,
+					IOCTL_DISK_GET_DRIVE_LAYOUT_EX,
+					NULL,
+					0,
+					(LPVOID) buffer.data(),
+					(DWORD) buffer.size(),
+					(LPDWORD) &bytesReturned,
+					NULL) && (bytesReturned >= sizeof (DRIVE_LAYOUT_INFORMATION_EX)))
 				{
-					for (DWORD i = 0; i < layout->PartitionCount; i++)
+					PDRIVE_LAYOUT_INFORMATION_EX layout = (PDRIVE_LAYOUT_INFORMATION_EX) buffer.data();
+					// sanity checks
+					if (layout->PartitionCount <= 256)
 					{
-						if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_MBR)
+						for (DWORD i = 0; i < layout->PartitionCount; i++)
 						{
-							if (layout->PartitionEntry[i].Mbr.PartitionType == 0)
-								continue;
+							if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_MBR)
+							{
+								if (layout->PartitionEntry[i].Mbr.PartitionType == 0)
+									continue;
 
-							bHasPartition = true;
+								bHasPartition = true;
 
-							/* skip dynamic volume */
-							if (layout->PartitionEntry[i].Mbr.PartitionType == PARTITION_LDM)
-							{
-								bIsDynamic = true;
-								/* remove any partition that may have been added */
-								while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
-									mountableDevices.pop_back ();
-								break;
+								/* skip dynamic volume */
+								if (layout->PartitionEntry[i].Mbr.PartitionType == PARTITION_LDM)
+								{
+									bIsDynamic = true;
+									/* remove any partition that may have been added */
+									while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
+										mountableDevices.pop_back ();
+									break;
+								}
 							}
-						}
 
-						if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_GPT)
-						{
-							if (IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_ENTRY_UNUSED_GUID))
-								continue;
+							if (layout->PartitionEntry[i].PartitionStyle == PARTITION_STYLE_GPT)
+							{
+								if (IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_ENTRY_UNUSED_GUID))
+									continue;
 
-							bHasPartition = true;
+								bHasPartition = true;
 
-							/* skip dynamic volume */
-							if (	IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_METADATA_GUID)
-								||	IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_DATA_GUID)
-								)
-							{
-								bIsDynamic = true;
-								/* remove any partition that may have been added */
-								while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
-									mountableDevices.pop_back ();
-								break;
+								/* skip dynamic volume */
+								if (	IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_METADATA_GUID)
+									||	IsEqualGUID(layout->PartitionEntry[i].Gpt.PartitionType, PARTITION_LDM_DATA_GUID)
+									)
+								{
+									bIsDynamic = true;
+									/* remove any partition that may have been added */
+									while (!mountableDevices.empty() && (mountableDevices.back().SystemNumber == It->SystemNumber))
+										mountableDevices.pop_back ();
+									break;
+								}
 							}
-						}
 
-						WCHAR path[MAX_PATH];
-						StringCbPrintfW (path, sizeof(path), L"\\\\?\\GLOBALROOT\\Device\\Harddisk%d\\Partition%d", It->SystemNumber, layout->PartitionEntry[i].PartitionNumber);
-						HANDLE handle = CreateFile( path,
-							0,
-							FILE_SHARE_READ | FILE_SHARE_WRITE,
-							NULL,
-							OPEN_EXISTING,
-							0,
-							NULL );
-						if ((handle != INVALID_HANDLE_VALUE) || (GetLastError () == ERROR_ACCESS_DENIED))
-						{
-							AddDeviceToList (mountableDevices, It->SystemNumber, layout->PartitionEntry[i].PartitionNumber);
-							if (handle != INVALID_HANDLE_VALUE)
-								CloseHandle (handle);
+							WCHAR path[MAX_PATH];
+							StringCbPrintfW (path, sizeof(path), L"\\\\?\\GLOBALROOT\\Device\\Harddisk%d\\Partition%d", It->SystemNumber, layout->PartitionEntry[i].PartitionNumber);
+							HANDLE handle = CreateFile( path,
+								0,
+								FILE_SHARE_READ | FILE_SHARE_WRITE,
+								NULL,
+								OPEN_EXISTING,
+								0,
+								NULL );
+							if ((handle != INVALID_HANDLE_VALUE) || (GetLastError () == ERROR_ACCESS_DENIED))
+							{
+								AddDeviceToList (mountableDevices, It->SystemNumber, layout->PartitionEntry[i].PartitionNumber);
+								if (handle != INVALID_HANDLE_VALUE)
+									CloseHandle (handle);
+							}
 						}
 					}
 				}
-			}
 
-			if (bIsDynamic)
-				dynamicVolumesPresent = true;
+				if (bIsDynamic)
+					dynamicVolumesPresent = true;
 
-			if (!bHasPartition)
-				AddDeviceToList (mountableDevices, It->SystemNumber, 0);
+				if (!bHasPartition)
+					AddDeviceToList (mountableDevices, It->SystemNumber, 0);
 
-			CloseHandle (disk);
+				CloseHandle (disk);
+			}
 		}
 	}
 
 	rawHostDeviceList = newList;
 
 	// Starting from Vista, Windows does not create partition links for dynamic volumes so it is necessary to scan \\Device\\HarddiskVolumeX devices
-	if (dynamicVolumesPresent && (CurrentOSMajor >= 6))
+	if (!bFromService && dynamicVolumesPresent && (CurrentOSMajor >= 6))
 	{
 		for (int devNumber = 0; devNumber < 256; devNumber++)
 		{
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h
index 47ab035d..d2db4ba4 100644
--- a/src/Common/Dlgcode.h
+++ b/src/Common/Dlgcode.h
@@ -626,7 +626,7 @@ inline std::wstring AppendSrcPos (const wchar_t* msg, const char* srcPos)
 {
 	return std::wstring (msg? msg : L"") + L"\n\nSource: " + SingleStringToWide (srcPos);
 }
-void UpdateMountableHostDeviceList ();
+void UpdateMountableHostDeviceList (bool bFromService);
 INT_PTR TextEditDialogBox (BOOL readOnly, HWND parent, const WCHAR* Title, std::string& text);
 
 // Display a wait dialog while calling the provided callback with the given parameter
author	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2017-07-19 11:25:25 +0200
committer	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2017-07-20 23:23:16 +0200
commit	fe26ed8a5d224b133c48e2846b851d585460ad30 (patch)
tree	b62288613dd14f293dc1cd818122cba51a50709a /src/Common
parent	d78a3d02737d230e30139498125415444f65e78c (diff)
download	VeraCrypt-fe26ed8a5d224b133c48e2846b851d585460ad30.tar.gz VeraCrypt-fe26ed8a5d224b133c48e2846b851d585460ad30.zip