Merge branch 'master' into feature/hud-component-crosshair

Author: FileEX

.github/workflows/tests.yml

@@ -0,0 +1,41 @@
+name: "Tests"
+
+on:
+  push:
+    branches: ["master", "tests"]
+  pull_request:
+    branches: ["master"]
+  workflow_dispatch:
+
+jobs:
+  client-tests:
+    name: Client Tests (x86 Debug)
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Generate project files
+        shell: cmd
+        run: |
+          utils\premake5.exe install_cef
+          utils\premake5.exe install_unifont
+          utils\premake5.exe install_discord
+          utils\premake5.exe vs2026
+
+      - name: Build Tests_Client
+        shell: cmd
+        run: msbuild Build\Tests_Client.vcxproj /p:Configuration=Debug /p:Platform=Win32 /p:PlatformToolset=v143 /nologo /v:minimal
+
+      - name: Run tests
+        run: Bin\tests\Tests_Client_d.exe --gtest_output=xml:Bin\tests\test_results.xml
+
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: Bin/tests/test_results.xml

Client/game_sa/CModelInfoSA.cpp

@@ -608,7 +608,8 @@ void CModelInfoSA::Remove()
     // Remove our reference
     if (m_pInterface->usNumberOfRefs > 0)
     {
-        if (CTxdStore_GetTxd(m_pInterface->usTextureDictionary) != nullptr)
+        if (pGame && !pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(m_pInterface->usTextureDictionary) &&
+            CTxdStore_GetTxd(m_pInterface->usTextureDictionary) != nullptr)
             CTxdStore_RemoveRef(m_pInterface->usTextureDictionary);
         m_pInterface->usNumberOfRefs--;
     }
@@ -655,6 +656,33 @@ bool CModelInfoSA::IsLoaded()
     return false;
 }
 
+static void UnlinkStreamingInfoNeighbors(CStreamingInfo* pStreamInfo)
+{
+    if (!pStreamInfo || !pGame)
+        return;
+
+    if (pStreamInfo->loadState == eModelLoadState::LOADSTATE_NOT_LOADED)
+        return;
+
+    CStreaming* pStreaming = pGame->GetStreaming();
+    if (!pStreaming)
+        return;
+
+    constexpr unsigned short kInvalid = static_cast<unsigned short>(-1);
+    const unsigned short     prev = pStreamInfo->prevId;
+    const unsigned short     next = pStreamInfo->nextId;
+
+    CStreamingInfo* pPrev = (prev != kInvalid) ? pStreaming->GetStreamingInfo(prev) : nullptr;
+    CStreamingInfo* pNext = (next != kInvalid) ? pStreaming->GetStreamingInfo(next) : nullptr;
+
+    // If one side already points outside the streaming array, cut the
+    // reachable side instead of copying the bad link forward.
+    if (pPrev)
+        pPrev->nextId = (next == kInvalid || pNext) ? next : kInvalid;
+    if (pNext)
+        pNext->prevId = (prev == kInvalid || pPrev) ? prev : kInvalid;
+}
+
 bool CModelInfoSA::DoIsLoaded()
 {
     // return (BOOL)*(BYTE *)(ARRAY_ModelLoaded + 20*dwModelID);
@@ -673,24 +701,7 @@ bool CModelInfoSA::DoIsLoaded()
                 if (pStreamInfo)
                 {
                     // Unlink from SA's loaded-entry list before zeroing the link fields to avoid linked list corruptin
-                    if (pStreamInfo->loadState != eModelLoadState::LOADSTATE_NOT_LOADED)
-                    {
-                        constexpr unsigned short kInvalid = static_cast<unsigned short>(-1);
-                        const unsigned short     prev = pStreamInfo->prevId;
-                        const unsigned short     next = pStreamInfo->nextId;
-                        if (prev != kInvalid)
-                        {
-                            CStreamingInfo* pPrev = pGame->GetStreaming()->GetStreamingInfo(prev);
-                            if (pPrev)
-                                pPrev->nextId = next;
-                        }
-                        if (next != kInvalid)
-                        {
-                            CStreamingInfo* pNext = pGame->GetStreaming()->GetStreamingInfo(next);
-                            if (pNext)
-                                pNext->prevId = prev;
-                        }
-                    }
+                    UnlinkStreamingInfoNeighbors(pStreamInfo);
                     pStreamInfo->prevId = static_cast<unsigned short>(-1);
                     pStreamInfo->nextId = static_cast<unsigned short>(-1);
                     pStreamInfo->nextInImg = static_cast<unsigned short>(-1);
@@ -1094,25 +1105,39 @@ void CModelInfoSA::SetTextureDictionaryID(unsigned short usID)
     if (usOldTxdId == usID)
         return;
 
+    // CTxdStore functions (GetTxd, AddRef, RemoveRef) crash on free pool entries.
+    if (!pGame || pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(usID))
+        return;
+
     // Slot allocated (e.g. via engineRequestTXD) but TXD data isn't loaded yet.
-    // For unloaded models, just record the new TXD ID; SA streaming handles refs
-    // and texture resolution when it loads both the model and its TXD dependency.
-    // Loaded models fall through to the ref-transfer path below. CTxdStore_AddRef
-    // only touches usUsagesCount (never dereferences rwTexDictonary), and
-    // BuildTxdTextureMap returns an empty map for null TXDs, making the rebind a
-    // no-op. The real texture data arrives later via engineImageLinkTXD + restream.
+    // For unloaded models without geometry, record the new TXD ID and transfer
+    // entity refs so callers' pre-added refs are consumed. Loaded models fall
+    // through to the ref-transfer path below. CTxdStore_AddRef only touches
+    // usUsagesCount (never dereferences rwTexDictonary), and BuildTxdTextureMap
+    // returns an empty map for null TXDs, making the rebind a no-op. The real
+    // texture data arrives later via engineImageLinkTXD + restream.
     if (CTxdStore_GetTxd(usID) == nullptr)
     {
-        if (!pGame || pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(usID))
-            return;
-
         if (!m_pInterface->pRwObject)
         {
             if (!MapContains(ms_DefaultTxdIDMap, static_cast<unsigned short>(m_dwModelID)))
                 ms_DefaultTxdIDMap[static_cast<unsigned short>(m_dwModelID)] = usOldTxdId;
 
             ++ms_uiTxdAssignmentGeneration;
             m_pInterface->usTextureDictionary = usID;
+
+            // Transfer entity refs between TXDs even without geometry loaded.
+            // Callers that pre-add refs to prevent underflow expect them to be
+            // consumed here; skipping this leaks refs on the old TXD.
+            size_t referencesCount = m_pInterface->usNumberOfRefs;
+            for (size_t i = 0; i < referencesCount; i++)
+                CTxdStore_AddRef(usID);
+
+            if (!pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(usOldTxdId) && CTxdStore_GetTxd(usOldTxdId) != nullptr)
+            {
+                for (size_t i = 0; i < referencesCount; i++)
+                    CTxdStore_RemoveRef(usOldTxdId);
+            }
             return;
         }
 
@@ -1173,9 +1198,9 @@ void CModelInfoSA::SetTextureDictionaryID(unsigned short usID)
         }
     }
 
-    // Release old TXD refs after rebinding completes
-    // Only release if old slot is still valid to avoid crash on stale/orphaned TXD slots
-    if (CTxdStore_GetTxd(usOldTxdId) != nullptr)
+    // Release old TXD refs after rebinding. Skip if the slot was freed between
+    // capturing usOldTxdId and here - CTxdStore functions crash on free entries.
+    if (!pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(usOldTxdId) && CTxdStore_GetTxd(usOldTxdId) != nullptr)
     {
         for (size_t i = 0; i < referencesCount; i++)
             CTxdStore_RemoveRef(usOldTxdId);
@@ -2173,6 +2198,13 @@ void CModelInfoSA::ResetVehicleDummies(bool bRemoveFromDummiesMap)
         pVehicleModel = static_cast<CVehicleModelInfoSAInterface*>(GetInterface());
         if (!pVehicleModel || !pVehicleModel->pVisualInfo)
         {
+            if (pVehicleModel && pVehicleModel->usNumberOfRefs > 0)
+            {
+                if (pGame && !pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(pVehicleModel->usTextureDictionary) &&
+                    CTxdStore_GetTxd(pVehicleModel->usTextureDictionary) != nullptr)
+                    CTxdStore_RemoveRef(pVehicleModel->usTextureDictionary);
+                pVehicleModel->usNumberOfRefs--;
+            }
             if (bRemoveFromDummiesMap)
                 ms_ModelDefaultDummiesPosition.erase(iter);
             return;
@@ -2186,7 +2218,8 @@ void CModelInfoSA::ResetVehicleDummies(bool bRemoveFromDummiesMap)
 
     if (pVehicleModel->usNumberOfRefs > 0)
     {
-        if (CTxdStore_GetTxd(pVehicleModel->usTextureDictionary) != nullptr)
+        if (pGame && !pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(pVehicleModel->usTextureDictionary) &&
+            CTxdStore_GetTxd(pVehicleModel->usTextureDictionary) != nullptr)
             CTxdStore_RemoveRef(pVehicleModel->usTextureDictionary);
         pVehicleModel->usNumberOfRefs--;
     }
@@ -2215,6 +2248,13 @@ void CModelInfoSA::ResetAllVehicleDummies()
             pVehicleModel = static_cast<CVehicleModelInfoSAInterface*>(pModelInfoSA->GetInterface());
             if (!pVehicleModel || !pVehicleModel->pVisualInfo)
             {
+                if (pVehicleModel && pVehicleModel->usNumberOfRefs > 0)
+                {
+                    if (pGame && !pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(pVehicleModel->usTextureDictionary) &&
+                        CTxdStore_GetTxd(pVehicleModel->usTextureDictionary) != nullptr)
+                        CTxdStore_RemoveRef(pVehicleModel->usTextureDictionary);
+                    pVehicleModel->usNumberOfRefs--;
+                }
                 it = ms_ModelDefaultDummiesPosition.erase(it);
                 continue;
             }
@@ -2225,7 +2265,8 @@ void CModelInfoSA::ResetAllVehicleDummies()
 
         if (pVehicleModel->usNumberOfRefs > 0)
         {
-            if (CTxdStore_GetTxd(pVehicleModel->usTextureDictionary) != nullptr)
+            if (pGame && !pGame->GetPools()->GetTxdPool().IsFreeTextureDictonarySlot(pVehicleModel->usTextureDictionary) &&
+                CTxdStore_GetTxd(pVehicleModel->usTextureDictionary) != nullptr)
                 CTxdStore_RemoveRef(pVehicleModel->usTextureDictionary);
             pVehicleModel->usNumberOfRefs--;
         }
@@ -2764,24 +2805,7 @@ static void UnlinkAndResetStreamingInfo(CStreamingInfo* pStreamInfo)
     if (!pStreamInfo)
         return;
 
-    if (pStreamInfo->loadState != eModelLoadState::LOADSTATE_NOT_LOADED && pGame && pGame->GetStreaming())
-    {
-        constexpr unsigned short kInvalid = static_cast<unsigned short>(-1);
-        const unsigned short     prev = pStreamInfo->prevId;
-        const unsigned short     next = pStreamInfo->nextId;
-        if (prev != kInvalid)
-        {
-            CStreamingInfo* pPrev = pGame->GetStreaming()->GetStreamingInfo(prev);
-            if (pPrev)
-                pPrev->nextId = next;
-        }
-        if (next != kInvalid)
-        {
-            CStreamingInfo* pNext = pGame->GetStreaming()->GetStreamingInfo(next);
-            if (pNext)
-                pNext->prevId = prev;
-        }
-    }
+    UnlinkStreamingInfoNeighbors(pStreamInfo);
     *pStreamInfo = CStreamingInfo{};
     pStreamInfo->prevId = static_cast<unsigned short>(-1);
     pStreamInfo->nextId = static_cast<unsigned short>(-1);
@@ -2915,7 +2939,7 @@ void CModelInfoSA::MakeTimedObjectModel(ushort usBaseID)
     pNewInterface->pRwObject = nullptr;
     pNewInterface->usUnknown = 65535;
     pNewInterface->usDynamicIndex = 65535;
-    pNewInterface->timeInfo.m_wOtherTimeModel = 0;
+    pNewInterface->timeInfo.m_wOtherTimeModel = -1;
 
     ppModelInfo[m_dwModelID] = pNewInterface;