3 files changed, 100 insertions, 81 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
@@ -11865,10 +11865,13 @@ 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;
 	SP_DEVICE_INTERFACE_DATA deviceInterfaceData;
@@ -11979,18 +11982,18 @@ bool CompareDeviceList (const std::vector<HostDevice>& list1, const std::vector<
 
 	return true;
 }
 
-void UpdateMountableHostDeviceList ()
+void UpdateMountableHostDeviceList (bool bFromService)
 {
 	ByteArray buffer(4096);
 	DWORD bytesReturned;
 	bool dynamicVolumesPresent = false;
 
 	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))
 		return; //no change, return
@@ -12031,106 +12034,122 @@ 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++)
 		{
 			wstringstream strm;
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
@@ -625,9 +625,9 @@ void CorrectFileName (std::wstring& fileName);
 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
 typedef void (CALLBACK* WaitThreadProc)(void* pArg, HWND hWaitDlg);
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 6a7e1353..51a7c98a 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -494,9 +494,9 @@ static void InitMainDialog (HWND hwndDlg)
 		e.Show (NULL);
 	}
 
 	// initialize the list of devices available for mounting as early as possible
-	UpdateMountableHostDeviceList ();
+	UpdateMountableHostDeviceList (false);
 
 	// Resize the logo bitmap if the user has a non-default DPI
 	if (ScreenDPI != USER_DEFAULT_SCREEN_DPI
 		&& hbmLogoBitmapRescaled == NULL)	// If not re-called (e.g. after language pack change)
@@ -7118,9 +7118,9 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 	case WM_TIMER:
 		{
 			if (wParam == TIMER_ID_UPDATE_DEVICE_LIST)
 			{
-				UpdateMountableHostDeviceList ();
+				UpdateMountableHostDeviceList (false);
 			}
 			else
 			{
 				// Check mount list and update GUI if needed
@@ -9167,9 +9167,9 @@ static VOID WINAPI SystemFavoritesServiceMain (DWORD argc, LPTSTR *argv)
 	SystemFavoritesServiceSetStatus (SERVICE_START_PENDING, 120000);
 
 	SystemFavoritesServiceLogInfo (wstring (L"Initializing list of host devices"));
 	// initialize the list of devices available for mounting as early as possible
-	UpdateMountableHostDeviceList ();
+	UpdateMountableHostDeviceList (true);
 
 	SystemFavoritesServiceLogInfo (wstring (L"Starting System Favorites mounting process"));
 
 	try
@@ -9701,9 +9701,9 @@ BOOL MountFavoriteVolumes (HWND hwnd, BOOL systemFavorites, BOOL logOnMount, BOO
 		{
 			Sleep (5000);
 
 			SystemFavoritesServiceLogInfo (wstring (L"Updating list of host devices"));
-			UpdateMountableHostDeviceList ();
+			UpdateMountableHostDeviceList (true);
 
 			SystemFavoritesServiceLogInfo (wstring (L"Trying to mount skipped system favorites"));
 
 			// Update the service status to avoid being killed