Merge branch 'master' into commandhandler-controlling

Author: MohabCodeX

Client/core/Graphics/CVideoModeManager.cpp

@@ -687,9 +687,18 @@ bool CVideoModeManager::GetCurrentAdapterRect(LPRECT pOutRect)
 ///////////////////////////////////////////////////////////////
 SString CVideoModeManager::GetCurrentAdapterDeviceName()
 {
-    MONITORINFOEX monitorInfo;
+    if (!m_hCurrentMonitor)
+        return "";
+
+    MONITORINFOEX monitorInfo{};
     monitorInfo.cbSize = sizeof(MONITORINFOEX);
-    if (GetMonitorInfo(m_hCurrentMonitor, &monitorInfo))
-        return monitorInfo.szDevice;
+
+    if (GetMonitorInfoA(m_hCurrentMonitor, &monitorInfo))
+    {
+        // Ensure null termination for x86 safety
+        monitorInfo.szDevice[sizeof(monitorInfo.szDevice) - 1] = '\0';
+        return std::string(monitorInfo.szDevice);
+    }
+
     return "";
 }

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -1412,7 +1412,8 @@ void CPacketHandler::Packet_ChatEcho(NetBitStreamInterface& bitStream)
             bitStream.Read(szMessage, iNumberOfBytesUsed);
             szMessage[iNumberOfBytesUsed] = 0;
             // actual limits enforced on the remote client, this is the maximum a string can be to be printed.
-            if (MbUTF8ToUTF16(szMessage).size() <=
+            SString textToProcess = bColorCoded ? RemoveColorCodes(szMessage) : szMessage;
+            if (MbUTF8ToUTF16(textToProcess).size() <=
                 MAX_CHATECHO_LENGTH + 6)            // Extra 6 characters to fix #7125 (Teamsay + long name + long message = too long message)
             {
                 // Strip it for bad characters

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -260,21 +260,27 @@ bool CStaticFunctionDefinitions::ClearChatBox()
 
 bool CStaticFunctionDefinitions::OutputChatBox(const char* szText, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue, bool bColorCoded)
 {
-    if (strlen(szText) <= MAX_OUTPUTCHATBOX_LENGTH)
-    {
-        CLuaArguments Arguments;
-        Arguments.PushString(szText);
-        Arguments.PushNumber(ucRed);
-        Arguments.PushNumber(ucGreen);
-        Arguments.PushNumber(ucBlue);
+    if (!szText || szText[0] == '\0')
+        return false;
+    
+    SString textToProcess = bColorCoded ? RemoveColorCodes(szText) : szText;
+    
+    if (textToProcess.length() > MAX_OUTPUTCHATBOX_LENGTH) {
+        return false;
+    }
 
-        bool bCancelled = !g_pClientGame->GetRootEntity()->CallEvent("onClientChatMessage", Arguments, false);
-        if (!bCancelled)
-        {
-            m_pCore->ChatPrintfColor("%s", bColorCoded, ucRed, ucGreen, ucBlue, szText);
-            return true;
-        }
+    CLuaArguments Arguments;
+    Arguments.PushString(szText);
+    Arguments.PushNumber(ucRed);
+    Arguments.PushNumber(ucGreen);
+    Arguments.PushNumber(ucBlue);
+
+    bool bCancelled = !g_pClientGame->GetRootEntity()->CallEvent("onClientChatMessage", Arguments, false);
+    if (!bCancelled) {
+        m_pCore->ChatPrintfColor("%s", bColorCoded, ucRed, ucGreen, ucBlue, szText);
+        return true;
     }
+    
     return false;
 }
 

Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp

@@ -227,7 +227,7 @@ int CLuaUtilDefs::Split(lua_State* luaVM)
             lua_pushstring(luaVM, szToken);
             lua_settable(luaVM, -3);
 
-            szToken = strtok(NULL, strDelimiter);
+            szToken = strtok(nullptr, strDelimiter.c_str());
         }
 
         // Delete the text

Shared/sdk/SharedUtil.Template.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#ifdef __INTELLISENSE__
+    #pragma diag_suppress 842
+#endif
+
 #include <type_traits>
 #include <variant>