Improved server dll version check

Author: ccw808

MTA10_Server/core/CDynamicLibrary.cpp

@@ -99,6 +99,12 @@ bool CDynamicLibrary::Load ( const char* szFilename )
         }
     #endif
 
+    // Check for version mismatch
+    if ( !CheckMtaVersion( ExtractFilename( szFilename ) ) )
+    {
+        return false;
+    }
+
     // Return whether we succeeded or not
     return m_hModule != 0;
 }
@@ -150,3 +156,34 @@ FuncPtr_t CDynamicLibrary::GetProcedureAddress ( const char* szProcName )
 
     return NULL;
 }
+
+
+bool CDynamicLibrary::CheckMtaVersion( const char* szLibName )
+{
+#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
+// define MTASA_SKIP_VERSION_CHECKS in "build_overrides_s.h" to skip version checks
+#ifndef MTASA_SKIP_VERSION_CHECKS
+
+    if ( m_hModule == 0 )
+        return false;
+
+    char buffer[256];
+    buffer[0] = 0;
+    GetLibMtaVersion( buffer, sizeof( buffer ) );
+    SString strVersionCore = buffer;
+
+    buffer[0] = 0;
+    FUNC_GetMtaVersion* pfnGetMtaVersion = (FUNC_GetMtaVersion*) ( GetProcedureAddress ( "GetLibMtaVersion" ) );
+    if ( pfnGetMtaVersion )
+        pfnGetMtaVersion( buffer, sizeof( buffer ) );
+    if ( strVersionCore != buffer )
+    {
+        Print( "ERROR: '%s' library version is '%s' (Expected '%s')\n", szLibName, buffer, *strVersionCore );
+        Print( "Reinstall MTA\n" );
+        return false;
+    }
+
+#endif
+#endif
+    return true;
+}

MTA10_Server/core/CDynamicLibrary.h

@@ -31,6 +31,7 @@ class CDynamicLibrary
     bool            IsLoaded                ( void );
 
     FuncPtr_t       GetProcedureAddress     ( const char* szProcName );
+    bool            CheckMtaVersion         ( const char* szLibName );
 
 private:
     #ifdef WIN32

MTA10_Server/core/CServerImpl.cpp

@@ -165,38 +165,6 @@ void CServerImpl::Daemonize () const
 }
 #endif
 
-bool CServerImpl::CheckLibVersions( void )
-{
-#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
-// define MTASA_SKIP_VERSION_CHECKS in "build_overrides_s.h" to skip version checks
-#ifndef MTASA_SKIP_VERSION_CHECKS
-
-    char buffer[256];
-    buffer[0] = 0;
-    GetLibMtaVersion( buffer, sizeof( buffer ) );
-    SString strVersionCore = buffer;
-
-    CDynamicLibrary* dynLibList[] = { &m_NetworkLibrary, &m_XMLLibrary, &m_pModManager->GetDynamicLibrary() };
-    const char* dynLibNameList[] = { "net", "xml", "deathmatch" };
-
-    for( uint i = 0 ; i < NUMELMS( dynLibList ) ; i++ )
-    {
-        buffer[0] = 0;
-        FUNC_GetMtaVersion* pfnGetMtaVersion = (FUNC_GetMtaVersion*) ( dynLibList[i]->GetProcedureAddress ( "GetLibMtaVersion" ) );
-        if ( pfnGetMtaVersion )
-            pfnGetMtaVersion( buffer, sizeof( buffer ) );
-        if ( strVersionCore != buffer )
-        {
-            Print( "ERROR: '%s' library version is '%s' (Expected '%s')\n", dynLibNameList[i], buffer, *strVersionCore );
-            Print( "Try reinstalling\n" );
-            return false;
-        }
-    }
-
-#endif
-#endif
-    return true;
-}
 
 int CServerImpl::Run ( int iArgumentCount, char* szArguments [] )
 {
@@ -378,19 +346,8 @@ int CServerImpl::Run ( int iArgumentCount, char* szArguments [] )
                     // Make the modmanager load our mod
                     if ( m_pModManager->Load ( "deathmatch", iArgumentCount, szArguments ) )   // Hardcoded for now
                     {
-                        if ( CheckLibVersions() )
-                        {
-                            // Enter our mainloop
-                            MainLoop ();
-                        }
-                        else
-                        {
-                            // Version mismatch
-                            Print ( "Press Q to shut down the server!\n" );
-                            WaitForKey ( 'q' );
-                            DestroyWindow ( );
-                            return ERROR_LOADING_MOD;
-                        }
+                        // Enter our mainloop
+                        MainLoop ();
                     }
                     else
                     {

MTA10_Server/core/CServerImpl.h

@@ -73,7 +73,6 @@ class CServerImpl : public CServerInterface
 
 private:
     void                MainLoop            ( void );
-    bool                CheckLibVersions    ( void );
 
     bool                ParseArguments      ( int iArgumentCount, char* szArguments [] );