Moved things around to reduce anti-virus false positive.

Test fix for some guy having problems with CEF dll loading. 
Updated some error messages for VC2013.

MTA10/core/CCore.cpp

@@ -1140,6 +1140,15 @@ void CCore::InitialiseWeb ()
     if ( m_pWebCore )
         return;
 
+    // Ensure DllDirectory has not been changed
+    SString strDllDirectory = GetSystemDllDirectory();
+    SString strRequiredDllDirectory = CalcMTASAPath( "mta" );
+    if ( strRequiredDllDirectory.EqualsI( strDllDirectory ) == false )
+    {
+        AddReportLog( 3118, SString ( "DllDirectory wrong:  DllDirectory:'%s'  Path:'%s'", *strDllDirectory, *strRequiredDllDirectory ) );
+        SetDllDirectory( strRequiredDllDirectory );
+    }
+
     m_pWebCore = new CWebCore;
     m_pWebCore->Initialise ();
 }

MTA10/launch/StdInc.h

@@ -3,7 +3,6 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #define MTA_CLIENT
-#define SHARED_UTIL_WITH_SYS_INFO
 #include "SharedUtil.h"
 
 #include "resource.h"

MTA10/loader/MainFunctions.cpp

@@ -89,7 +89,7 @@ void InitLocalization( bool bNoFail )
         if ( !bNoFail )
             return;
         DisplayErrorMessageBox ( ("Loading core failed.  Please ensure that \n"
-                            "Microsoft Visual C++ 2008 SP1 Redistributable Package (x86) \n"
+                            "Microsoft Visual C++ 2013 Redistributable Package (x86) \n"
                             "and the latest DirectX is correctly installed."), _E("CL24"), "vc-redist-missing" );  // Core.dll load failed.  Ensure VC++ Redists and DX are installed
         return ExitProcess( EXIT_ERROR );
     }
@@ -112,7 +112,7 @@ void InitLocalization( bool bNoFail )
             return;
 
         DisplayErrorMessageBox ( ("Loading core failed.  Please ensure that \n"
-                            "Microsoft Visual C++ 2008 SP1 Redistributable Package (x86) \n"
+                            "Microsoft Visual C++ 2013 Redistributable Package (x86) \n"
                             "and the latest DirectX is correctly installed."), _E("CL26"), "vc-redist-missing" );  // Core.dll load failed.  Ensure VC++ Redists and DX are installed
         FreeLibrary ( hCoreModule );
         return ExitProcess( EXIT_ERROR );

MTA10_Server/launcher/Main.cpp

@@ -24,7 +24,6 @@
 #include "CDynamicLibrary.h"
 #include <iostream>
 #include "MTAPlatform.h"
-#define SHARED_UTIL_WITH_SYS_INFO
 #include "SharedUtil.h"
 #include "SharedUtil.hpp"
 
@@ -140,7 +139,7 @@ int main ( int argc, char* argv [] )
         printf ( "ERROR: Could not load %s\n", LIB_CORE );
         printf ( "* Check installed data files.\n" );
 #ifdef WIN32
-        printf ( "* Check installed Microsoft Visual C++ 2008 SP1 Redistributable Package (x86).\n" );
+        printf ( "* Check installed Microsoft Visual C++ 2013 Redistributable Package (x86).\n" );
 #endif
     }
 

Shared/sdk/SString.h

@@ -113,6 +113,7 @@ class SString : public std::string
     bool            Contains            ( const SString& strOther ) const;
     bool            ContainsI           ( const SString& strOther ) const;
     bool            CompareI            ( const SString& strOther ) const;
+    bool            EqualsI             ( const SString& strOther ) const                       { return CompareI( strOther ); }
     SString         SubStr              ( int iPos, int iCount = 0x3fffffff ) const;
     SString         Left                ( int iCount ) const;
     SString         Right               ( int iCount ) const;

Shared/sdk/SharedUtil.Misc.h

@@ -139,6 +139,10 @@ namespace SharedUtil
     SString         GetSystemErrorMessage           ( uint uiErrorCode, bool bRemoveNewlines = true, bool bPrependCode = true );
     void            SetClipboardText                ( const SString& strText );
 
+    // Version checks
+    bool            IsWindowsVersionOrGreater       ( WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor );
+    bool            IsWindowsXPSP3OrGreater         ( void );
+
 #endif
 
     // Ensure rand() seed gets set to a new unique value

Shared/sdk/SharedUtil.Misc.hpp

@@ -35,7 +35,6 @@ CCriticalSection CRefCountable::ms_CS;
 std::map < uint, uint > ms_ReportAmountMap;
 
 #ifdef MTA_CLIENT
-#ifdef WIN32
 
 #define TROUBLE_URL1 "http://updatesa.multitheftauto.com/sa/trouble/?v=_VERSION_&id=_ID_&tr=_TROUBLE_"
 
@@ -781,7 +780,6 @@ SString SharedUtil::GetSystemErrorMessage ( uint uiError, bool bRemoveNewlines,
 }
 
 
-#endif
 
 
 #ifdef ExpandEnvironmentStringsForUser
@@ -877,9 +875,40 @@ bool SharedUtil::ShellExecuteNonBlocking ( const SString& strAction, const SStri
     return MyShellExecute ( false, strAction, strFile, strParameters, strDirectory );
 }
 
-
 #endif  // MTA_CLIENT
 
+#ifdef WIN32
+///////////////////////////////////////////////////////////////////////////
+//
+// SharedUtil::IsWindowsVersionOrGreater
+//
+// From Windows Kits\8.1 VersionHelpers.h
+// (Ignores compatibility mode)
+//
+///////////////////////////////////////////////////////////////////////////
+bool SharedUtil::IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor)
+{
+    OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 };
+    DWORDLONG        const dwlConditionMask = VerSetConditionMask(
+        VerSetConditionMask(
+        VerSetConditionMask(
+            0, VER_MAJORVERSION, VER_GREATER_EQUAL),
+               VER_MINORVERSION, VER_GREATER_EQUAL),
+               VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
+
+    osvi.dwMajorVersion = wMajorVersion;
+    osvi.dwMinorVersion = wMinorVersion;
+    osvi.wServicePackMajor = wServicePackMajor;
+
+    return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | 
+      VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;
+}
+
+bool SharedUtil::IsWindowsXPSP3OrGreater()
+{
+    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 3);
+}
+#endif  // WIN32
 
 static uchar ToHexChar ( uchar c )
 {

Shared/sdk/SharedUtil.SysInfo.h

@@ -33,8 +33,6 @@ namespace SharedUtil
     void        GetWMIAntiVirusStatus           ( std::vector < SString >& outEnabledList, std::vector < SString >& outDisabledList );
     bool        GetLibVersionInfo               ( const SString& strLibName, SLibVersionInfo* pOutLibVersionInfo );
     bool        Is64BitOS                       ( void );
-    bool        IsWindowsVersionOrGreater       ( WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor );
-    bool        IsWindowsXPSP3OrGreater         ( void );
 }
 
 #endif

Shared/sdk/SharedUtil.SysInfo.hpp

@@ -557,40 +557,3 @@ bool SharedUtil::Is64BitOS( void )
 }
 
 #endif  // MTA_CLIENT
-
-#ifdef WIN32
-
-///////////////////////////////////////////////////////////////
-//
-// SharedUtil::IsWindowsVersionOrGreater
-//
-// From Windows Kits\8.1 VersionHelpers.h
-// (Ignores compatibility mode)
-//
-///////////////////////////////////////////////////////////////
-bool SharedUtil::IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor)
-{
-    OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 };
-    DWORDLONG        const dwlConditionMask = VerSetConditionMask(
-        VerSetConditionMask(
-        VerSetConditionMask(
-            0, VER_MAJORVERSION, VER_GREATER_EQUAL),
-               VER_MINORVERSION, VER_GREATER_EQUAL),
-               VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
-
-    osvi.dwMajorVersion = wMajorVersion;
-    osvi.dwMinorVersion = wMinorVersion;
-    osvi.wServicePackMajor = wServicePackMajor;
-
-    return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | 
-      VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;
-}
-
-bool SharedUtil::IsWindowsXPSP3OrGreater()
-{
-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 3);
-}
-
-#endif  // WIN32
-
-