Addendum to 2ab6fe0: Fix file lock issue during updater extract process

Author: Dutchman101

Client/loader/Install.cpp

@@ -14,6 +14,7 @@
 #include "Dialogs.h"
 #include "Main.h"
 #include <unrar/dll.hpp>
+#include <algorithm>
 #include <optional>
 #include <memory>
 #include <filesystem>
@@ -237,7 +238,7 @@ static void GetArchiveFilesInDirectory(const SString& directory, std::vector<Man
 }
 
 /**
- * @brief Terminates every process locking a file with the user's consent.
+ * @brief Tries to clear file locks by terminating other processes with the user's consent.
  * @param absolutePath The path to the file to check
  * @param displayName Name of the file in the user prompt
  * @return True if the file is not locked (anymore), false otherwise
@@ -246,9 +247,27 @@ static bool TerminateFileLockingProcesses(const SString& absolutePath, const SSt
 {
     WString            filePath(absolutePath);
     std::vector<DWORD> processIds = GetProcessListUsingFile(filePath);
+    const DWORD        currentProcessId = GetCurrentProcessId();
+
+    const auto RemoveCurrentProcessId = [&]() {
+        const auto newEnd = std::remove(processIds.begin(), processIds.end(), currentProcessId);
+        const bool removedCurrentProcess = newEnd != processIds.end();
+        processIds.erase(newEnd, processIds.end());
+        return removedCurrentProcess;
+    };
+
+    const auto FailOnCurrentProcessLock = [&]() {
+        AddReportLog(5055, SString("TerminateFileLockingProcesses: current process %lu is locking '%s'", currentProcessId, absolutePath.c_str()));
+        return false;
+    };
 
     while (true)
     {
+        const bool currentProcessLocksFile = RemoveCurrentProcessId();
+
+        if (currentProcessLocksFile)
+            return FailOnCurrentProcessLock();
+
         if (processIds.empty())
             return true;
 
@@ -274,6 +293,10 @@ static bool TerminateFileLockingProcesses(const SString& absolutePath, const SSt
             "MTA: San Andreas", MB_CANCELTRYCONTINUE | MB_ICONQUESTION | MB_TOPMOST);
 
         processIds = GetProcessListUsingFile(filePath);
+        const bool currentProcessLocksFileAfterPrompt = RemoveCurrentProcessId();
+
+        if (currentProcessLocksFileAfterPrompt)
+            return FailOnCurrentProcessLock();
 
         if (processIds.empty())
             return true;
@@ -644,7 +667,8 @@ static int RunInstall()
     if (files.empty())
         return 0;
 
-    // Check if any executable or library is locked by any process and terminate it with the user's consent.
+    // Binary replacements can fail after backup work has started, so clear blocking locks before
+    // any file copy starts.
     for (const InstallableFile& file : files)
     {
         if (file.relativePath.EndsWithI(".exe") || file.relativePath.EndsWithI(".dll"))

Client/loader/Main.cpp

@@ -148,8 +148,10 @@ namespace
         // Start logging.....now
         BeginEventLog();
 
-        // Start localization if possible
-        InitLocalization(false);
+        // A temp updater shouldnt load the install root's core.dll before RunInstall;
+        // the localization module stays loaded and would block replacement.
+        if (!IsTemporaryUpdateLaunchPath(GetLaunchPath()))
+            InitLocalization(false);
 
         // Handle commands from the installer
         HandleSpecialLaunchOptions();