Improve patcher logging (#1569)

Author: ccw808

Client/loader/CFileGenerator.cpp

@@ -146,7 +146,7 @@ CFileGenerator::EResult CFileGenerator::UnrarFile(const SString& strArchive, con
         return RecordError(EResult::ArchiveOpenError, strArchive);
 
     // Extract first file
-    EResult       result = RecordError(EResult::ArchiveExtractError, strOutputFile);
+    EResult       result = EResult::ArchiveExtractError;
     RARHeaderData headerData = {};
     if (RARReadHeader(hArcData, &headerData) == 0)
     {
@@ -156,6 +156,9 @@ CFileGenerator::EResult CFileGenerator::UnrarFile(const SString& strArchive, con
         }
     }
     RARCloseArchive(hArcData);
+
+    if (result != EResult::Success)
+        return RecordError(result, strArchive, strOutputFile);
     return result;
 }
 

Client/loader/CInstallManager.cpp

@@ -577,9 +577,10 @@ SString CInstallManager::_ProcessGtaVersionCheck()
     }
 
     // Check required GTA file is correct
-    if (GenerateHashHexStringFromFile(EHashFunctionType::MD5, strPatchBase) != strPatchBaseMd5)
+    SString strPatchBaseCurrentMd5 = GenerateHashHexStringFromFile(EHashFunctionType::MD5, strPatchBase);
+    if (strPatchBaseCurrentMd5 != strPatchBaseMd5)
     {
-        AddReportLog(5053, SString("_ProcessGtaVersionCheck: Incorrect file '%s'", *strPatchBase));
+        AddReportLog(5053, SString("_ProcessGtaVersionCheck: Incorrect file '%s' %d %s", *strPatchBase, (int)FileSize(strPatchBase), *strPatchBaseCurrentMd5));
         SString strMessage(_("MTA:SA cannot continue because the following files are incorrect:"));
         strMessage += "\n\n" + strPatchBase;
 #ifdef TO_DO
@@ -590,6 +591,9 @@ SString CInstallManager::_ProcessGtaVersionCheck()
 #endif
     }
 
+    // Ensure GTA exe is not running
+    TerminateGTAIfRunning();
+
     // Backup current gta_sa.exe
     SString strGTAExeBak = strGtaExe + ".bak";
     if (!FileExists(strGTAExeBak))
@@ -605,7 +609,7 @@ SString CInstallManager::_ProcessGtaVersionCheck()
     {
         if (!IsUserAdmin())
         {
-            AddReportLog(3052, SString("_ProcessGtaVersionCheck: GenerateFile failed (%d) - trying as admin", result));
+            AddReportLog(3052, SString("_ProcessGtaVersionCheck: GenerateFile failed (%d) - trying as admin %s", result, *fileGenerator.GetErrorRecords()));
             m_strAdminReason = _("Patch GTA");
             return "fail";
         }