Synchronize changes from 1.6 master branch [ci skip]

b5060de Print local server output to console on disconnect/shutdown
86945b4 Improve graceful server shutdown

Author: github-actions[bot]

Client/mods/deathmatch/logic/CServer.cpp

@@ -225,6 +225,13 @@ void CServer::Stop(bool graceful)
         }
     }
 
+    // Print out the remaining server output (but not everything to avoid blocking here).
+    for (int i = 0; i < 5; ++i)
+    {
+        if (!PrintServerOutputToConsole())
+            break;
+    }
+
     if (DWORD exitCode{}; GetExitCodeProcess(m_process, &exitCode))
     {
         const char* errorText = "Unknown exit code";
@@ -256,16 +263,7 @@ void CServer::Pulse()
     if (!m_isRunning)
         return;
 
-    // Try to read the process standard output and then write it to the console window.
-    if (DWORD numBytes{}; PeekNamedPipe(m_stdout, nullptr, 0, nullptr, &numBytes, nullptr) && numBytes > 0)
-    {
-        std::array<char, 4096> buffer{};
-
-        if (ReadFile(m_stdout, buffer.data(), std::min<DWORD>(buffer.size(), numBytes), &numBytes, nullptr) && numBytes > 0)
-        {
-            g_pCore->GetConsole()->Printf("%.*s", numBytes, buffer.data());
-        }
-    }
+    PrintServerOutputToConsole();
 
     // Check if the server process was terminated externally.
     if (!IsProcessRunning(m_process))
@@ -285,3 +283,20 @@ void CServer::Pulse()
         }
     }
 }
+
+bool CServer::PrintServerOutputToConsole()
+{
+    // Try to read the process standard output and then write it to the console window.
+    if (DWORD numBytes{}; PeekNamedPipe(m_stdout, nullptr, 0, nullptr, &numBytes, nullptr) && numBytes > 0)
+    {
+        std::array<char, 4096> buffer{};
+
+        if (ReadFile(m_stdout, buffer.data(), std::min<DWORD>(buffer.size(), numBytes), &numBytes, nullptr) && numBytes > 0)
+        {
+            g_pCore->GetConsole()->Printf("%.*s", numBytes, buffer.data());
+            return true;
+        }
+    }
+
+    return false;
+}

Client/mods/deathmatch/logic/CServer.h

@@ -30,6 +30,9 @@ class CServer final
 
     const std::string& GetPassword() const noexcept { return m_password; }
 
+public:
+    bool PrintServerOutputToConsole();
+
 private:
     bool        m_isRunning{};
     bool        m_isAcceptingConnections{};

Server/core/CModManagerImpl.cpp

@@ -130,7 +130,6 @@ void CModManagerImpl::Unload(bool bKeyPressBeforeTerm)
                 Print("Press Q to shut down the server!\n");
                 WaitForKey('q');
             }
-            TerminateProcess(GetCurrentProcess(), GetExitCode());
         }
 #endif
         // Unload the library

Server/core/CServerImpl.cpp

@@ -351,21 +351,26 @@ int CServerImpl::Run(int iArgumentCount, char* szArguments[])
 
         if (m_XMLLibrary.Load(PathJoin(m_strServerPath, SERVER_BIN_PATH, szXMLLibName)))
         {
-            // Grab the network interface
-            InitNetServerInterface pfnInitNetServerInterface = (InitNetServerInterface)(m_NetworkLibrary.GetProcedureAddress("InitNetServerInterface"));
-            InitXMLInterface       pfnInitXMLInterface = (InitXMLInterface)(m_XMLLibrary.GetProcedureAddress("InitXMLInterface"));
+            auto pfnInitNetServerInterface = (InitNetServerInterface)(m_NetworkLibrary.GetProcedureAddress("InitNetServerInterface"));
+            auto pfnReleaseNetServerInterface = (ReleaseNetServerInterface)(m_NetworkLibrary.GetProcedureAddress("ReleaseNetServerInterface"));
+            auto pfnInitXMLInterface = (InitXMLInterface)(m_XMLLibrary.GetProcedureAddress("InitXMLInterface"));
+
             if (pfnInitNetServerInterface && pfnInitXMLInterface)
             {
                 // Call it to grab the network interface class
                 m_pNetwork = pfnInitNetServerInterface();
                 m_pXML = pfnInitXMLInterface(*m_strServerModPath);
+
                 if (m_pNetwork && m_pXML)
                 {
                     // Make the modmanager load our mod
                     if (m_pModManager->Load("deathmatch", iArgumentCount, szArguments))            // Hardcoded for now
                     {
                         // Enter our mainloop
                         MainLoop();
+
+                        if (pfnReleaseNetServerInterface)
+                            pfnReleaseNetServerInterface();
                     }
                     else
                     {

Server/core/CServerImpl.h

@@ -28,6 +28,7 @@ class CServerImpl;
 
 typedef CXML* (*InitXMLInterface)(const char* szSaveFlagDirectory);
 typedef CNetServer* (*InitNetServerInterface)();
+typedef void (*ReleaseNetServerInterface)();
 
 #ifdef WIN32
 constexpr SHORT SCREEN_BUFFER_SIZE = 256;