Synchronize changes from 1.6 master branch [ci skip]

da7af8f New dialog for user assisted game searching (#3884)

Author: github-actions[bot]

Client/loader/Utils.cpp

@@ -22,6 +22,7 @@
 #include <Softpub.h>
 #include <wintrust.h>
 #include <version.h>
+#include <windows.h>
 #pragma comment (lib, "wintrust")
 
 namespace fs = std::filesystem;
@@ -527,30 +528,26 @@ bool LookForGtaProcess(SString& strOutPathFilename)
 //
 //
 ///////////////////////////////////////////////////////////////
-SString DoUserAssistedSearch()
+static const SString DoUserAssistedSearch() noexcept
 {
-    SString strResult;
+    SString result;
 
-    ShowProgressDialog(g_hInstance, _("Searching for Grand Theft Auto San Andreas"), true);
+    MessageBox(nullptr, _("Start Grand Theft Auto: San Andreas.\nEnsure the game is placed in the 'Program Files (x86)' folder."), _("Searching for GTA: San Andreas"), MB_OK | MB_ICONINFORMATION);
 
-    while (!UpdateProgress(0, 100, _("Please start Grand Theft Auto San Andreas")))
+    while (true)
     {
-        SString strPathFilename;
-        // Check if user has started GTA
-        if (LookForGtaProcess(strPathFilename))
+        SString path;
+
+        if (LookForGtaProcess(path))
         {
-            // If so, get the exe path
-            ExtractFilename(strPathFilename, &strResult, NULL);
-            // And then stop it
+            ExtractFilename(path, &result, nullptr);
             TerminateGTAIfRunning();
-            break;
+            return result;
         }
 
-        Sleep(200);
+        if (MessageBox(nullptr, _("Sorry, game not found.\nStart Grand Theft Auto: San Andreas and click retry.\nEnsure the game is placed in the 'Program Files (x86)' folder."), _("Searching for GTA: San Andreas"), MB_RETRYCANCEL | MB_ICONWARNING) == IDCANCEL)
+            return result;
     }
-
-    HideProgressDialog();
-    return strResult;
 }
 
 ///////////////////////////////////////////////////////////////