Synchronize changes from 1.6 master branch [ci skip]

dede110 Remove NetBitStreamInterfaceNoVersion
f855b36 Limit some disablewarnings to system:windows
39a9ff5 Move destructor of dwarf2reader::CompilationUnit to cc file
2b80fbf Remove env step for macOS build
2ecdac7 Change linux-build defaults for macOS
328ea8f Remove x64 for macOS
3300770 Fix Linux compile error and some warnings
539bd29 Switch to macOS-15 runner image
6fabe57 Fix Linux compiler error
224172f Fix warning in json-c
ea834e2 Fix for commit 3d01dbb
aa7653e Update Premake from 5.0.0-b5 to Update Premake from 5.0.0-b7
3d01dbb Default to GCC-15 for macOS
ba48e34 Switch to C++23
a57ae58 Remove /SAFESEH:NO
52308a3 Resolve errors and warnings in remainder
7b98424 Resolve errors and warnings in Client Deathmatch
73489af Resolve errors and warnings in Client
e2e7e98 Resolve errors and warnings in Server
17f7386 Resolve errors and warnings in Shared
4dcf140 Resolve errors and warnings in vendor
1762b18 Add MSVC build option /permissive-

Author: github-actions[bot]

.github/workflows/build.yaml

@@ -52,7 +52,7 @@ jobs:
 
   macOS:
     name: macOS
-    runs-on: macOS-13
+    runs-on: macOS-15
     steps:
       - uses: actions/checkout@v4
 
@@ -64,7 +64,7 @@ jobs:
         run: brew link --overwrite mysql
 
       - name: Run Build
-        run: ./linux-build.sh --os=macosx
+        run: ./linux-build.sh
 
   linux:
     strategy:

Client/cefweb/CWebCore.cpp

@@ -502,7 +502,7 @@ void CWebCore::ProcessInputMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
     if ((keyEvent.type == KEYEVENT_CHAR) && isKeyDown(VK_RMENU))
     {
         HKL   current_layout = ::GetKeyboardLayout(0);
-        SHORT scan_res = ::VkKeyScanExW(wParam, current_layout);
+        SHORT scan_res = ::VkKeyScanExW(static_cast<WCHAR>(wParam), current_layout);
         if ((HIBYTE(scan_res) & (2 | 4)) == (2 | 4))
         {
             keyEvent.modifiers &= ~(EVENTFLAG_CONTROL_DOWN | EVENTFLAG_ALT_DOWN);

Client/cefweb/premake5.lua

@@ -6,7 +6,6 @@ project "Client Webbrowser"
 
 	filter "system:windows"
 		includedirs { "../../vendor/sparsehash/src/windows" }
-		linkoptions { "/SAFESEH:NO" }
 		buildoptions { "-Zm130" }
 
 	filter {}

Client/core/CAdditionalVertexStreamManager.cpp

@@ -466,13 +466,13 @@ SAdditionalStreamInfo* CAdditionalVertexStreamManager::CreateAdditionalStreamInf
         declNew->Usage = D3DDECLUSAGE_NORMAL;
         declNew->UsageIndex = 0;
         if (FAILED(m_pDevice->CreateVertexDeclaration(elements, &info.pVertexDeclaration)))
-            return false;
+            return nullptr;
 
         // Create new stream
         info.Stride = sizeof(float) * 3;
         UINT Size2 = ConvertPTSize(state.decl.VertexBufferDesc1.Size);
         if (FAILED(m_pDevice->CreateVertexBuffer(Size2, D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED, &info.pStreamData, NULL)))
-            return false;
+            return nullptr;
 
         // Save info
         MapSet(m_AdditionalStreamInfoMap, state.stream1.pStreamData, info);

Client/core/CChat.cpp

@@ -737,7 +737,7 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
                         {
                             // Check size if it's ok, then output
                             SString strOutput = strCurrentInput.replace(iFound, std::string::npos, strPlayerName);
-                            if (MbUTF8ToUTF16(strOutput).size() < m_iCharacterLimit)
+                            if (MbUTF8ToUTF16(strOutput).size() < static_cast<size_t>(m_iCharacterLimit))
                             {
                                 bSuccess = true;
                                 m_strLastPlayerNamePart = strPlayerNamePart;
@@ -802,7 +802,7 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
             }
 
             // If we haven't exceeded the maximum number of characters per chat message, append the char to the message and update the input control
-            if (MbUTF8ToUTF16(m_strInputText).size() < m_iCharacterLimit)
+            if (MbUTF8ToUTF16(m_strInputText).size() < static_cast<size_t>(m_iCharacterLimit))
             {
                 if (KeyboardArgs.codepoint >= 32)
                 {

Client/core/CClientVariables.cpp

@@ -106,10 +106,10 @@ bool CClientVariables::Get(const std::string& strVariable, CColor& val)
     try
     {
         ss >> iR >> iG >> iB >> iA;
-        val.R = iR;
-        val.G = iG;
-        val.B = iB;
-        val.A = iA;
+        val.R = static_cast<unsigned char>(iR);
+        val.G = static_cast<unsigned char>(iG);
+        val.B = static_cast<unsigned char>(iB);
+        val.A = static_cast<unsigned char>(iA);
     }
     catch (...)
     {

Client/core/CCommandFuncs.cpp

@@ -480,7 +480,8 @@ void CCommandFuncs::FakeLag(const char* szCmdLine)
     if (parts.size() > 3)
         iKBPSLimit = atoi(parts[3]);
 
-    g_pCore->GetNetwork()->SetFakeLag(iPacketLoss, iExtraPing, iExtraPingVary, iKBPSLimit);
+    g_pCore->GetNetwork()->SetFakeLag(static_cast<unsigned short>(iPacketLoss), static_cast<unsigned short>(iExtraPing),
+                                      static_cast<unsigned short>(iExtraPingVary), iKBPSLimit);
     g_pCore->GetConsole()->Print(SString("Client send lag is now: %d%% packet loss and %d extra ping with %d extra ping variance and %d KBPS limit",
                                          iPacketLoss, iExtraPing, iExtraPingVary, iKBPSLimit));
 }

Client/core/CCommands.cpp

@@ -85,6 +85,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 {
     // Copy szParametersIn so the contents can be changed
     char* szParameters = NULL;
+    char empyParameters[1] = { 0 };
     if (szParametersIn)
     {
         size_t sizeParameters = strlen(szParametersIn) + 1;
@@ -115,7 +116,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
                 }
                 if (szParameters == NULL)
                 {
-                    szParameters = "";
+                    szParameters = empyParameters;
                 }
             }
         }

Client/core/CConnectManager.cpp

@@ -165,7 +165,7 @@ bool CConnectManager::Reconnect(const char* szHost, unsigned short usPort, const
     unsigned int uiPort = 0;
     CVARS_GET("host", m_strHost);
     CVARS_GET("port", uiPort);
-    m_usPort = uiPort;
+    m_usPort = static_cast<unsigned short>(uiPort);
 
     // If keeping the same host & port, retrieve the password as well
     if (!szHost || !szHost[0] || m_strHost == szHost)

Client/core/CCore.cpp

@@ -61,13 +61,13 @@ static HMODULE WINAPI SkipDirectPlay_LoadLibraryA(LPCSTR fileName)
         const fs::path inLaunchDir = fs::path{FromUTF8(GetLaunchPath())} / "enbseries" / "enbhelper.dll";
 
         if (fs::is_regular_file(inLaunchDir, ec))
-            return Win32LoadLibraryA(inLaunchDir.u8string().c_str());
+            return Win32LoadLibraryA(UTF8FilePath(inLaunchDir).c_str());
 
         // Try to load enbhelper.dll from the GTA install directory second.
         const fs::path inGTADir = g_gtaDirectory / "enbseries" / "enbhelper.dll";
 
         if (fs::is_regular_file(inGTADir, ec))
-            return Win32LoadLibraryA(inGTADir.u8string().c_str());
+            return Win32LoadLibraryA(UTF8FilePath(inGTADir).c_str());
 
         return nullptr;
     }
@@ -1757,8 +1757,8 @@ void CCore::UpdateRecentlyPlayed()
     {
         CServerBrowser* pServerBrowser = CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetServerBrowser();
         CServerList*    pRecentList = pServerBrowser->GetRecentList();
-        pRecentList->Remove(Address, uiPort);
-        pRecentList->AddUnique(Address, uiPort, true);
+        pRecentList->Remove(Address, static_cast<ushort>(uiPort));
+        pRecentList->AddUnique(Address, static_cast<ushort>(uiPort), true);
 
         pServerBrowser->SaveRecentlyPlayedList();
         if (!m_pConnectManager->m_strLastPassword.empty())