Merge branch 'multitheftauto:master' into startstop

Author: Nico8345

.github/workflows/codeql.yml

@@ -27,7 +27,7 @@ jobs:
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - https://gh.io/using-larger-runners (GitHub.com only)
     # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'windows-2025' }}
     permissions:
       # required for all workflows
       security-events: write
@@ -43,13 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - language: actions
-          build-mode: none
         - language: c-cpp
-          build-mode: autobuild
-        - language: javascript-typescript
-          build-mode: none
-        - language: python
           build-mode: none
         # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
         # Use `c-cpp` to analyze code written in C, C++ or both

Client/core/CCommandFuncs.cpp

@@ -318,6 +318,10 @@ void CCommandFuncs::Reconnect(const char* szParameters)
         // Start the connect
         if (CCore::GetSingleton().GetConnectManager()->Reconnect(strHost.c_str(), usPort, strPassword.c_str(), false))
         {
+            if (CCore::GetSingleton().GetConnectManager()->WasQuickConnect())
+            {
+                CCore::GetSingleton().GetConnectManager()->SetQuickConnect(false);
+            }
             CCore::GetSingleton().GetConsole()->Printf(_("reconnect: Reconnecting to %s:%u..."), strHost.c_str(), usPort);
         }
         else

Client/core/CConnectManager.h

@@ -26,10 +26,14 @@ class CConnectManager
 
     bool Abort();
 
+    bool WasQuickConnect() const noexcept { return m_quickConnect; }
+
     void DoPulse();
 
     void OnServerExists();
 
+    void SetQuickConnect(bool quick) noexcept { m_quickConnect = quick; }
+    
     static void OpenServerFirewall(in_addr Address, ushort usHttpPort = 80, bool bHighPriority = false);
 
     static bool StaticProcessPacket(unsigned char ucPacketID, class NetBitStreamInterface& bitStream);
@@ -59,4 +63,5 @@ class CConnectManager
     bool             m_bNotifyServerBrowser;
 
     bool CheckNickProvided(const char* szNick);
+    bool m_quickConnect{false};
 };

Client/core/CMainMenu.cpp

@@ -850,6 +850,9 @@ bool CMainMenu::OnMenuClick(CGUIMouseEventArgs Args)
                 }
 
                 break;
+            case MENU_ITEM_QUICK_CONNECT:
+                AskUserIfHeWantsToDisconnect(m_pHoveredItem->menuType);
+                return true;
             default:
                 break;
         }
@@ -914,7 +917,8 @@ bool CMainMenu::OnQuickConnectButtonClick(CGUIElement* pElement, bool left)
             ShowNetworkNotReadyWindow();
             return true;
         }
-
+        
+        g_pCore->GetConnectManager()->SetQuickConnect(true);
         g_pCore->GetCommands()->Execute("reconnect", "");
     }
     else
@@ -1262,6 +1266,9 @@ void CMainMenu::WantsToDisconnectCallBack(void* pData, uint uiButton)
             case MENU_ITEM_DISCONNECT:
                 OnDisconnectButtonClick();
                 break;
+            case MENU_ITEM_QUICK_CONNECT:
+                OnQuickConnectButtonClick(nullptr, true);
+                break;
             default:
                 break;
         }

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/core/DXHook/CProxyDirect3DDevice9.cpp

@@ -117,6 +117,7 @@ ULONG CProxyDirect3DDevice9::Release()
         // Call event handler
         CDirect3DEvents9::OnDirect3DDeviceDestroy(m_pDevice);
         delete this;
+        return ulRefCount - 1;
     }
 
     return m_pDevice->Release();

Client/core/Graphics/CRenderItemManager.cpp

@@ -167,7 +167,7 @@ CVectorGraphicItem* CRenderItemManager::CreateVectorGraphic(uint width, uint hei
     }
 
     UpdateMemoryUsage();
-
+    
     return pVectorItem;
 }
 
@@ -723,7 +723,7 @@ void CRenderItemManager::UpdateMemoryUsage()
             continue;
         int iMemoryKBUsed = pRenderItem->GetVideoMemoryKBUsed();
 
-        if (pRenderItem->IsA(CFileTextureItem::GetClassId()))
+        if (pRenderItem->IsA(CFileTextureItem::GetClassId()) || pRenderItem->IsA(CVectorGraphicItem::GetClassId()))
             m_iTextureMemoryKBUsed += iMemoryKBUsed;
         else if (pRenderItem->IsA(CRenderTargetItem::GetClassId()) || pRenderItem->IsA(CScreenSourceItem::GetClassId()))
             m_iRenderTargetMemoryKBUsed += iMemoryKBUsed;

Client/game_sa/CHudSA.cpp

@@ -122,6 +122,9 @@ void CHudSA::InitComponentList()
         {1, HUD_VEHICLE_NAME, 1, FUNC_DrawVehicleName, 1, 0xCC, 0xC3},
         {1, HUD_AREA_NAME, 1, FUNC_DrawAreaName, 1, 0xCC, 0xC3},
         {1, HUD_RADAR, 1, FUNC_DrawRadar, 1, 0xCC, 0xC3},
+        {1, HUD_RADAR_MAP, 1, FUNC_CRadar_DrawMap, 1, 0xCC, 0xC3},
+        {1, HUD_RADAR_BLIPS, 1, FUNC_CRadar_DrawBlips, 1, 0xCC, 0xC3},
+        {1, HUD_RADAR_ALTIMETER, 1, CODE_ShowRadarAltimeter, 2, 0xCC, 0xEB30},
         {1, HUD_CLOCK, 0, VAR_DisableClock, 1, 1, 0},
         {1, HUD_RADIO, 1, FUNC_DrawRadioName, 1, 0xCC, 0xC3},
         {1, HUD_WANTED, 1, FUNC_DrawWantedLevel, 1, 0xCC, 0xC3},

Client/game_sa/CHudSA.h

@@ -49,7 +49,11 @@
 #define FUNC_CSprite2d_Draw                  0x728350
 #define FUNC_CSprite_RenderOneXLUSprite     0x70D000
 
+#define FUNC_CRadar_DrawMap         0x586B00
+#define FUNC_CRadar_DrawBlips       0x588050
+
 #define CODE_ShowMoney              0x58F47D
+#define CODE_ShowRadarAltimeter     0x58A5A6
 
 #define VAR_CTheScripts_bDrawCrossHair 0xA44490
 #define VAR_RSGlobal                   0xC17040

Client/game_sa/CPoolsSA.cpp

@@ -26,6 +26,7 @@
 #include "CWorldSA.h"
 
 #include "enums/VehicleClass.h"
+#include <new>
 
 extern CGameSA* pGame;
 
@@ -242,7 +243,7 @@ CObject* CPoolsSA::AddObject(CClientObject* pClientObject, DWORD dwModelID, bool
 
     if (m_objectPool.ulCount < MAX_OBJECTS)
     {
-        pObject = new CObjectSA(dwModelID, bBreakingDisabled);
+        pObject = new (std::nothrow) CObjectSA(dwModelID, bBreakingDisabled);
 
         if (pObject && AddObjectToPool(pClientObject, pObject))
         {