Synchronize changes from 1.6 master branch [ci skip]

c7b54b6 Load AddDllDirectory on demand
f75e75b Add missing newline characters to log lines

Author: github-actions[bot]

Client/core/CSteamClient.cpp

@@ -377,9 +377,24 @@ bool CSteamClient::Load()
         return false;
     }
 
+    static auto pAddDllDirectory = ([]() -> decltype(&AddDllDirectory) {
+        if (const HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); kernel32 != nullptr)
+        {
+            return reinterpret_cast<decltype(&AddDllDirectory)>(static_cast<void*>(GetProcAddress(kernel32, "AddDllDirectory")));
+        }
+
+        return nullptr;
+    })();
+
+    if (pAddDllDirectory == nullptr)
+    {
+        WriteErrorEvent("Your operating system is outdated and is missing the KB2533623 update package for AddDllDirectory");
+        return false;
+    }
+
     WriteDebugEvent(SString("Using steamclient.dll: %s", *ToUTF8(steamClientPath.value())));
     SetEnvironmentVariableW(L"SteamAppId", L"" STEAM_GTASA_APP_ID);
-    AddDllDirectory(steamDirPath.c_str());
+    pAddDllDirectory(steamDirPath.c_str());
     {
         static wchar_t pathBuffer[65536];
         GetEnvironmentVariableW(L"PATH", pathBuffer, sizeof(pathBuffer) / sizeof(wchar_t));
@@ -425,7 +440,7 @@ bool CSteamClient::Load()
 
     releaseLibraryLock.reset();
 
-    Native::CreateInterface = reinterpret_cast<decltype(Native::CreateInterface)>(GetProcAddress(dll, "CreateInterface"));
+    Native::CreateInterface = reinterpret_cast<decltype(Native::CreateInterface)>(static_cast<void*>(GetProcAddress(dll, "CreateInterface")));
 
     if (!Native::CreateInterface)
     {

Client/mods/deathmatch/logic/CResource.cpp

@@ -258,7 +258,7 @@ void CResource::Load()
         m_pResourceTXDRoot->SetParent(m_pResourceEntity);
     }
 
-    CLogger::LogPrintf("> Starting resource '%s'", *m_strResourceName);
+    CLogger::LogPrintf("> Starting resource '%s'\n", *m_strResourceName);
 
     // Flag resource files as readable
     for (std::list<CResourceConfigItem*>::iterator iter = m_ConfigFiles.begin(); iter != m_ConfigFiles.end(); ++iter)

Server/mods/deathmatch/logic/CResource.cpp

@@ -2248,15 +2248,15 @@ bool CResource::RemoveFile(const char* szName)
                 m_ResourceFiles.remove(pFileFound);
             }
             else
-                CLogger::LogPrintf("WARNING: Problems removing resource file from memory");
+                CLogger::LogPrintf("WARNING: Problems removing resource file from memory\n");
         }
 
         // Delete the file
         char szFullFilepath[MAX_PATH + 1];
         snprintf(szFullFilepath, MAX_PATH, "%s%s", m_strResourceDirectoryPath.c_str(), szName);
 
         if (File::Delete(szFullFilepath) != 0)
-            CLogger::LogPrintf("WARNING: Problems deleting the actual file, but was removed from resource");
+            CLogger::LogPrintf("WARNING: Problems deleting the actual file, but was removed from resource\n");
 
         // Delete the metafile
         pMetaFile->Write();

Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp

@@ -339,7 +339,7 @@ int CLuaResourceDefs::addResourceConfig(lua_State* luaVM)
         iType = CResourceFile::RESOURCE_FILE_TYPE_CONFIG;
         if (strType != "server")
         {
-            CLogger::LogPrintf("WARNING: Unknown config file type specified for %s. Defaulting to 'server'", lua_tostring(luaVM, lua_upvalueindex(1)));
+            CLogger::LogPrintf("WARNING: Unknown config file type specified for %s. Defaulting to 'server'\n", lua_tostring(luaVM, lua_upvalueindex(1)));
         }
     }
 

Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.cpp

@@ -27,7 +27,7 @@ bool CUnoccupiedVehicleSyncPacket::Read(NetBitStreamInterface& BitStream)
     {
         if (i > uiMaxCount)
         {
-            CLogger::LogPrintf("WARN: Received excess unoccupied vehicle sync data (%d bytes)", BitStream.GetNumberOfUnreadBits() / 8);
+            CLogger::LogPrintf("WARN: Received excess unoccupied vehicle sync data (%d bytes)\n", BitStream.GetNumberOfUnreadBits() / 8);
             break;
         }