Added VS runtime check in launcher (on load failure).

Fixed auto-update problems associated with file permissions.

Author: ccw808

MTA10/launch/Main.cpp

@@ -58,11 +58,22 @@ int WINAPI WinMain ( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
     }
     else
     {
+        iReturnCode = 1;
         SString strError = GetSystemErrorMessage ( GetLastError () );
         SString strMessage ( "Failed to load: '%s'\n\n%s", *strLoaderDllPathFilename, *strError );
         AddReportLog ( 5711, strMessage );
-        BrowseToSolution ( "loader-dll-missing", ASK_GO_ONLINE, strMessage );
-        iReturnCode = 1;
+
+        // Check if runtime is loadable
+        HMODULE hModule = LoadLibrary ( MSVCR_DLL );
+        if ( hModule )
+        {
+            BrowseToSolution ( "loader-dll-missing", ASK_GO_ONLINE, strMessage );
+            FreeLibrary ( hModule );
+        }
+        else
+        {
+            BrowseToSolution ( "launch-" MSVCR_DLL "-missing", ASK_GO_ONLINE, "Redistributable Packages for Visual Studio are not installed" );     
+        }
     }
 
     return iReturnCode;

MTA10/launch/StdInc.h

@@ -11,11 +11,11 @@
 #include "shellapi.h"
 
 #include <shlobj.h>
-//#include <Psapi.h>
-//#include <time.h>
 
-//#include "Main.h"
-//#include "Install.h"
-//#include "Utils.h"
-//#include "..\version.h"
-//#include "CInstallManager.h"
+#if _MSC_VER == 1500        // MSVC++ 9.0 (Visual Studio 2008)
+    #define MSVCR_DLL "msvcr90.dll"
+#elif _MSC_VER == 1800      // MSVC++ 12.0 (Visual Studio 2013)
+    #define MSVCR_DLL "msvcr120.dll"
+#else
+    #error "Insert VCR info"
+#endif

MTA10/loader/Install.cpp

@@ -121,14 +121,15 @@ bool DoInstallFiles ( void )
     // Copy current(old) files into backup location
     for ( unsigned int i = 0 ; i < itemList.size () ; i++ )
     {
-        if ( !FileCopy ( itemList[i].strDestPathFilename, itemList[i].strBackupPathFilename ) )
+        const SFileItem& item = itemList[i];
+        if ( !FileCopy ( item.strDestPathFilename, item.strBackupPathFilename ) )
         {
-            if ( FileExists ( itemList[i].strDestPathFilename ) )
+            if ( FileExists ( item.strDestPathFilename ) )
             {
-                AddReportLog ( 5021, SString ( "InstallFiles: Couldn't backup '%s' to '%s'", itemList[i].strDestPathFilename.c_str (), itemList[i].strBackupPathFilename.c_str () ) );
+                AddReportLog ( 5021, SString ( "InstallFiles: Couldn't backup '%s' to '%s'", *item.strDestPathFilename, *item.strBackupPathFilename ) );
                 return false;
             }
-            AddReportLog ( 4023, SString ( "InstallFiles: Couldn't backup '%s' as it does not exist", itemList[i].strDestPathFilename.c_str () ) );
+            AddReportLog ( 4023, SString ( "InstallFiles: Couldn't backup '%s' as it does not exist", *item.strDestPathFilename ) );
         }
     }
 
@@ -137,30 +138,40 @@ bool DoInstallFiles ( void )
     std::vector < SFileItem > fileListSuccess;
     for (  unsigned int i = 0 ; i < itemList.size () ; i++ )
     {
-        if ( !FileCopy ( itemList[i].strSrcPathFilename, itemList[i].strDestPathFilename ) )
+        const SFileItem& item = itemList[i];
+        if ( !FileCopy ( item.strSrcPathFilename, item.strDestPathFilename ) )
         {
-            AddReportLog ( 5022, SString ( "InstallFiles: Couldn't copy '%s' to '%s'", itemList[i].strSrcPathFilename.c_str (), itemList[i].strDestPathFilename.c_str () ) );
-            bOk = false;
-            break;
+            // If copy failed, check if we really need to copy the file
+            if ( GenerateSha256HexStringFromFile( item.strSrcPathFilename ) != GenerateSha256HexStringFromFile( item.strDestPathFilename ) )
+            {
+                AddReportLog ( 5022, SString ( "InstallFiles: Couldn't copy '%s' to '%s'", *item.strSrcPathFilename, *item.strDestPathFilename ) );
+                bOk = false;
+                break;
+            }
         }
-        fileListSuccess.push_back ( itemList[i] );
+        fileListSuccess.push_back ( item );
     }
 
     // If fail, copy back old files
     if ( !bOk )
     {
         bool bPossibleDisaster = false;
-        for (  unsigned int i = 0 ; i < fileListSuccess.size () ; i++ )
+        for ( unsigned int i = 0 ; i < fileListSuccess.size () ; i++ )
         {
+            const SFileItem& item = fileListSuccess[i];
             int iRetryCount = 3;
             while ( true )
             {
-                if ( FileCopy ( fileListSuccess[i].strBackupPathFilename, fileListSuccess[i].strDestPathFilename ) )
+                if ( FileCopy ( item.strBackupPathFilename, item.strDestPathFilename ) )
+                    break;
+
+                // If copy failed, check if we really need to copy the file
+                if ( GenerateSha256HexStringFromFile( item.strBackupPathFilename ) != GenerateSha256HexStringFromFile( item.strDestPathFilename ) )
                     break;
 
                 if ( !--iRetryCount )
                 {
-                    AddReportLog ( 5023, SString ( "InstallFiles: Possible disaster restoring '%s' to '%s'", itemList[i].strBackupPathFilename.c_str (), itemList[i].strDestPathFilename.c_str () ) );
+                    AddReportLog ( 5023, SString ( "InstallFiles: Possible disaster restoring '%s' to '%s'", *item.strBackupPathFilename, *item.strDestPathFilename ) );
                     bPossibleDisaster = true;
                     break;
                 }

Shared/installer/nightly.nsi

@@ -508,10 +508,24 @@ DontInstallRedistVC12:
             DetailPrint "$(INFO_UPDATE_PERMISSIONS)"
 
             # Fix permissions for MTA install directory
+
+            # Check if install path begins with "..Program Files (x86)\M" or "..Program Files\M"
+            StrCpy $3 "0"
             StrCpy $0 "$PROGRAMFILES\M"
             StrLen $2 $0
             StrCpy $1 "$INSTDIR" $2
             ${If} $0 == $1
+                StrCpy $3 "1"
+            ${EndIf}
+
+            StrCpy $0 "$PROGRAMFILES64\M"
+            StrLen $2 $0
+            StrCpy $1 "$INSTDIR" $2
+            ${If} $0 == $1
+                StrCpy $3 "1"
+            ${EndIf}
+
+            ${If} $3 == "1"
                 FastPerms::FullAccessPlox "$INSTDIR"
             ${Else}
                 # More conservative permissions blat if install directory it too different from default
@@ -714,7 +728,10 @@ DontInstallRedistVC12:
 		!ifndef LIGHTBUILD
             File "${FILES_ROOT}\MTA San Andreas\Multi Theft Auto.exe.dat"
 		!endif
-		
+
+        # Ensure exe file can be updated without admin
+		AccessControl::GrantOnFile "$INSTDIR\Multi Theft Auto.exe" "(BU)" "FullAccess"
+
         ${If} $AddToGameExplorer == 1
             ${GameExplorer_UpdateGame} ${GUID}
             ${If} ${Errors}