1 files changed, 45 insertions, 28 deletions
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp
index 2964e04d..a83db22d 100644
--- a/src/Common/BootEncryption.cpp
+++ b/src/Common/BootEncryption.cpp
@@ -1959,35 +1959,31 @@ namespace VeraCrypt
 			throw ParameterIncorrect (SRC_POS);
 		}
 	}
 
-#ifndef SETUP
-
-	void BootEncryption::RegisterSystemFavoritesService (BOOL registerService)
+	void BootEncryption::RegisterSystemFavoritesService (BOOL registerService, BOOL noFileHandling)
 	{
-		if (!IsAdmin() && IsUacSupported())
-		{
-			Elevator::RegisterSystemFavoritesService (registerService);
-			return;
-		}
-
 		SC_HANDLE scm = OpenSCManager (NULL, NULL, SC_MANAGER_ALL_ACCESS);
 		throw_sys_if (!scm);
 
-		string servicePath = GetServiceConfigPath (TC_APP_NAME ".exe");
+		string servicePath = GetServiceConfigPath (TC_APP_NAME ".exe", false);
+		string serviceLegacyPath = GetServiceConfigPath (TC_APP_NAME ".exe", true);
 
 		if (registerService)
 		{
 			try
 			{
-				RegisterSystemFavoritesService (FALSE);
+				RegisterSystemFavoritesService (FALSE, noFileHandling);
 			}
 			catch (...) { }
 
-			char appPath[TC_MAX_PATH];
-			throw_sys_if (!GetModuleFileName (NULL, appPath, sizeof (appPath)));
+			if (!noFileHandling)
+			{
+				char appPath[TC_MAX_PATH];
+				throw_sys_if (!GetModuleFileName (NULL, appPath, sizeof (appPath)));
 
-			throw_sys_if (!CopyFile (appPath, servicePath.c_str(), FALSE));
+				throw_sys_if (!CopyFile (appPath, servicePath.c_str(), FALSE));
+			}
 
 			SC_HANDLE service = CreateService (scm,
 				TC_SYSTEM_FAVORITES_SERVICE_NAME,
 				TC_APP_NAME " System Favorites",
@@ -2020,9 +2016,9 @@ namespace VeraCrypt
 			catch (...)
 			{
 				try
 				{
-					RegisterSystemFavoritesService (false);
+					RegisterSystemFavoritesService (FALSE, noFileHandling);
 				}
 				catch (...) { }
 
 				throw;
@@ -2040,12 +2036,45 @@ namespace VeraCrypt
 
 			throw_sys_if (!DeleteService (service));
 			CloseServiceHandle (service);
 
-			DeleteFile (servicePath.c_str());
+			if (!noFileHandling)
+			{
+				DeleteFile (servicePath.c_str());
+				if (serviceLegacyPath != servicePath)
+					DeleteFile (serviceLegacyPath.c_str());
+			}
 		}
 	}
 
+	void BootEncryption::SetDriverConfigurationFlag (uint32 flag, bool state)
+	{
+		DWORD configMap = ReadDriverConfigurationFlags();
+
+		if (state)
+			configMap |= flag;
+		else
+			configMap &= ~flag;
+#ifdef SETUP
+		WriteLocalMachineRegistryDword ("SYSTEM\\CurrentControlSet\\Services\\veracrypt", TC_DRIVER_CONFIG_REG_VALUE_NAME, configMap);
+#else
+		WriteLocalMachineRegistryDwordValue ("SYSTEM\\CurrentControlSet\\Services\\veracrypt", TC_DRIVER_CONFIG_REG_VALUE_NAME, configMap);
+#endif
+	}
+
+#ifndef SETUP
+
+	void BootEncryption::RegisterSystemFavoritesService (BOOL registerService)
+	{
+		if (!IsAdmin() && IsUacSupported())
+		{
+			Elevator::RegisterSystemFavoritesService (registerService);
+			return;
+		}
+
+		RegisterSystemFavoritesService (registerService, FALSE);
+	}
+
 	void BootEncryption::CheckRequirements ()
 	{
 		if (nCurrentOS == WIN_2000)
 			throw ErrorException ("SYS_ENCRYPTION_UNSUPPORTED_ON_CURRENT_OS", SRC_POS);
@@ -2530,20 +2559,8 @@ namespace VeraCrypt
 
 		throw_sys_if (!WriteLocalMachineRegistryDword (keyPath, valueName, value));
 	}
 
-	void BootEncryption::SetDriverConfigurationFlag (uint32 flag, bool state)
-	{
-		DWORD configMap = ReadDriverConfigurationFlags();
-
-		if (state)
-			configMap |= flag;
-		else
-			configMap &= ~flag;
-
-		WriteLocalMachineRegistryDwordValue ("SYSTEM\\CurrentControlSet\\Services\\veracrypt", TC_DRIVER_CONFIG_REG_VALUE_NAME, configMap);
-	}
-
 	void BootEncryption::StartDecryption (BOOL discardUnreadableEncryptedSectors)
 	{
 		BootEncryptionStatus encStatus = GetStatus();