Merge branch 'master' into default-skin-update

Author: patrikjuvonen

Client/cefweb/CWebView.cpp

@@ -41,8 +41,11 @@ CWebView::~CWebView()
             g_pCore->GetWebCore()->SetFocusedWebView(nullptr);
     }
 
+    // Make sure we don't dead lock the CEF render thread
+    ResumeCefThread();
+
     // Ensure that CefRefPtr::~CefRefPtr doesn't try to release it twice (it has already been released in CWebView::OnBeforeClose)
-    m_pWebView = nullptr;
+    m_pWebView = nullptr;    
 
     OutputDebugLine("CWebView::~CWebView");
 }
@@ -77,6 +80,9 @@ void CWebView::CloseBrowser()
     // CefBrowserHost::CloseBrowser calls the destructor after the browser has been destroyed
     m_bBeingDestroyed = true;
 
+    // Make sure we don't dead lock the CEF render thread
+    ResumeCefThread();
+
     if (m_pWebView)
         m_pWebView->GetHost()->CloseBrowser(true);
 }
@@ -200,7 +206,7 @@ void CWebView::UpdateTexture()
 
     auto pSurface = m_pWebBrowserRenderItem->m_pD3DRenderTargetSurface;
     if (m_bBeingDestroyed || !pSurface)
-        return;
+        m_RenderData.changed = m_RenderData.popupShown = false;
 
     // Discard current buffer if size doesn't match
     // This happens when resizing the browser as OnPaint is called asynchronously
@@ -281,6 +287,9 @@ void CWebView::UpdateTexture()
             pSurface->UnlockRect();
         }
     }
+
+    m_RenderData.cefThreadState = ECefThreadState::Running;
+    m_RenderData.cefThreadCv.notify_all();
 }
 
 void CWebView::ExecuteJavascript(const SString& strJavascriptCode)
@@ -447,6 +456,8 @@ void CWebView::Resize(const CVector2D& size)
     // Send resize event to CEF
     if (m_pWebView)
         m_pWebView->GetHost()->WasResized();
+
+    ResumeCefThread();
 }
 
 CVector2D CWebView::GetSize()
@@ -709,6 +720,10 @@ void CWebView::OnPaint(CefRefPtr<CefBrowser> browser, CefRenderHandler::PaintEle
     m_RenderData.height = height;
     m_RenderData.dirtyRects = dirtyRects;
     m_RenderData.changed = true;
+
+    // Wait for the main thread to handle drawing the texture
+    m_RenderData.cefThreadState = ECefThreadState::Wait;    
+    m_RenderData.cefThreadCv.wait(lock, [&](){ return m_RenderData.cefThreadState == ECefThreadState::Running; });
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -1069,3 +1084,14 @@ void CWebView::OnBeforeContextMenu(CefRefPtr<CefBrowser> browser, CefRefPtr<CefF
     // Show no context menu
     model->Clear();
 }
+
+void CWebView::ResumeCefThread()
+{
+    {
+        // It's recommended to unlock a mutex before the cv notifying to avoid a possible pessimization
+        std::unique_lock<std::mutex> lock(m_RenderData.dataMutex);
+        m_RenderData.cefThreadState = ECefThreadState::Running;
+    }
+
+    m_RenderData.cefThreadCv.notify_all();
+}

Client/cefweb/CWebView.h

@@ -30,6 +30,12 @@
 
 #define MTA_CEF_USERAGENT "Multi Theft Auto: San Andreas Client " MTA_DM_BUILDTAG_LONG
 
+enum class ECefThreadState
+{
+    Running = 0, // CEF thread is currently running
+    Wait // CEF thread is waiting for the main thread
+};
+
 class CWebView : public CWebViewInterface,
                  private CefClient,
                  private CefRenderHandler,
@@ -173,6 +179,8 @@ class CWebView : public CWebViewInterface,
                                      CefRefPtr<CefMenuModel> model) override;
 
 private:
+    void ResumeCefThread();
+
     CefRefPtr<CefBrowser> m_pWebView;
     CWebBrowserItem*      m_pWebBrowserRenderItem;
 
@@ -192,6 +200,8 @@ class CWebView : public CWebViewInterface,
     {
         bool                    changed = false;
         std::mutex              dataMutex;
+        ECefThreadState         cefThreadState = ECefThreadState::Running;
+        std::condition_variable cefThreadCv;
 
         const void*                buffer;
         int                        width, height;

Client/launch/NEU/Multi Theft Auto.gdf.xml

@@ -42,8 +42,7 @@ void CClientVectorGraphicDisplay::Render()
     if (HasUpdated())
     {
         m_pVectorGraphic->OnUpdate();
-    }
-        
+    }        
 }
 
 void CClientVectorGraphicDisplay::UpdateTexture()
@@ -52,46 +51,41 @@ void CClientVectorGraphicDisplay::UpdateTexture()
         return;
 
     Document* svgDocument = m_pVectorGraphic->GetSVGDocument();
-
-    if (svgDocument == nullptr)
+    if (!svgDocument)
         return;
 
     CVectorGraphicItem* pVectorGraphicItem = m_pVectorGraphic->GetRenderItem();
-
     if (!pVectorGraphicItem)
         return;
 
     IDirect3DSurface9* surface = m_pVectorGraphic->GetRenderItem()->m_pD3DRenderTargetSurface;
-
     if (!surface)
         return;
 
-    IDirect3DDevice9* device = pVectorGraphicItem->m_pDevice;
-
-    uint width = pVectorGraphicItem->m_uiSizeX;
-    uint height = pVectorGraphicItem->m_uiSizeY;
-
-    Bitmap bitmap = svgDocument->renderToBitmap(width, height);
+    Bitmap bitmap = svgDocument->renderToBitmap(pVectorGraphicItem->m_uiSizeX, pVectorGraphicItem->m_uiSizeY);
+    if (!bitmap.valid())
+        return;
 
     // Lock surface
     D3DLOCKED_RECT LockedRect;
-    surface->LockRect(&LockedRect, nullptr, 0);
+    if (SUCCEEDED(surface->LockRect(&LockedRect, nullptr, D3DLOCK_DISCARD)))
+    {
+        auto surfaceData = static_cast<byte*>(LockedRect.pBits);
+        auto sourceData = static_cast<const byte*>(bitmap.data());
 
-    auto surfaceData = static_cast<byte*>(LockedRect.pBits);
-    auto sourceData = static_cast<const byte*>(bitmap.data());
+        for (uint32_t y = 0; y < bitmap.height(); ++y)
+        {
+            memcpy(surfaceData, sourceData, bitmap.width() * 4);            // 4 bytes per pixel
 
-    for (uint32_t y = 0; y < bitmap.height(); ++y)
-    {
-        memcpy(surfaceData, sourceData, bitmap.width() * 4);            // 4 bytes per pixel
+            // advance row pointers
+            sourceData += bitmap.stride();
+            surfaceData += LockedRect.Pitch;
+        }
 
-        // advance row pointers
-        sourceData += bitmap.stride();
-        surfaceData += LockedRect.Pitch;
+        // Unlock surface
+        surface->UnlockRect();
     }
 
-    // Unlock surface
-    surface->UnlockRect();
-
     m_bHasUpdated = false;
 }
 
@@ -101,25 +95,22 @@ void CClientVectorGraphicDisplay::ClearTexture()
         return;
 
     CVectorGraphicItem* pVectorGraphicItem = m_pVectorGraphic->GetRenderItem();
-
     if (!pVectorGraphicItem)
         return;
 
     IDirect3DSurface9* surface = pVectorGraphicItem->m_pD3DRenderTargetSurface;
-
     if (!surface)
         return;
 
-    IDirect3DDevice9* device = pVectorGraphicItem->m_pDevice;
-
     // Lock surface
     D3DLOCKED_RECT LockedRect;
-    surface->LockRect(&LockedRect, nullptr, 0);
-
-    device->ColorFill(surface, nullptr, D3DCOLOR_ARGB(0, 0, 0, 0));
+    if (SUCCEEDED(surface->LockRect(&LockedRect, nullptr, D3DLOCK_DISCARD)))
+    {
+        std::memset(LockedRect.pBits, 0x0, LockedRect.Pitch * pVectorGraphicItem->m_uiSurfaceSizeY);
 
-    // Unlock surface
-    surface->UnlockRect();
+        // Unlock surface
+        surface->UnlockRect();
+    }
 
     m_bIsCleared = true;
 }

Client/mods/deathmatch/logic/CClientVectorGraphicDisplay.cpp

@@ -4999,6 +4999,8 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
         return;
     }
 
+    bool bFatalError = false;
+
     CResource* pResource = g_pClientGame->m_pResourceManager->Add(usResourceID, szResourceName, pResourceEntity, pResourceDynamicEntity, strMinServerReq,
                                                                   strMinClientReq, bEnableOOP);
     if (pResource)
@@ -5047,61 +5049,80 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
                         }
                         szChunkData[ucChunkSize] = NULL;
 
-                        bitStream.Read(ucChunkSubType);
-                        bitStream.Read(chunkChecksum.ulCRC);
-                        bitStream.Read((char*)chunkChecksum.md5.data, sizeof(chunkChecksum.md5.data));
-                        bitStream.Read(dChunkDataSize);
-
-                        uint uiDownloadSize = (uint)dChunkDataSize;
-                        uiTotalSizeProcessed += uiDownloadSize;
-                        if (uiTotalSizeProcessed / 1024 / 1024 > 50)
-                            g_pCore->UpdateDummyProgress(uiTotalSizeProcessed / 1024 / 1024, " MB");
-
-                        // Create the resource downloadable
-                        CDownloadableResource* pDownloadableResource = NULL;
-                        switch (ucChunkSubType)
+                        std::string strChunkData = szChunkData;
+                        // make the full file path (c:/path/to/mods/deathmatch/resources/resource/)
+                        std::string           strMetaPathTemp;
+                        std::string           strResPathTemp = pResource->GetResourceDirectoryPath(ACCESS_PUBLIC, strMetaPathTemp);
+                        std::filesystem::path fsResPath = std::filesystem::path(strResPathTemp).lexically_normal();
+                        std::string           strResPath = fsResPath.string();
+                        // make the full file path (c:/path/to/mods/deathmatch/resources/resource/file.lua)
+                        std::string           strResFilePathTemp = strResPath + static_cast<char>(std::filesystem::path::preferred_separator) + strChunkData;
+                        std::filesystem::path fsResFilePath = std::filesystem::path(strResFilePathTemp).lexically_normal();
+                        std::string           strResFilePath = fsResFilePath.string();
+                        // check that full file path contains full resource path
+                        if (strResFilePath.rfind(strResPath.c_str(), 0) != 0)
+                        {
+                            bFatalError = true;
+                            AddReportLog(2081, SString("Path %s (expected %s)", strResFilePath.c_str(), strResPath.c_str()));
+                        }
+                        else
                         {
-                            case CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_FILE:
+                            bitStream.Read(ucChunkSubType);
+                            bitStream.Read(chunkChecksum.ulCRC);
+                            bitStream.Read((char*)chunkChecksum.md5.data, sizeof(chunkChecksum.md5.data));
+                            bitStream.Read(dChunkDataSize);
+
+                            uint uiDownloadSize = (uint)dChunkDataSize;
+                            uiTotalSizeProcessed += uiDownloadSize;
+                            if (uiTotalSizeProcessed / 1024 / 1024 > 50)
+                                g_pCore->UpdateDummyProgress(uiTotalSizeProcessed / 1024 / 1024, " MB");
+
+                            // Create the resource downloadable
+                            CDownloadableResource* pDownloadableResource = NULL;
+                            switch (ucChunkSubType)
                             {
-                                bool bDownload = bitStream.ReadBit();
-                                pDownloadableResource = pResource->AddResourceFile(CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_FILE, szChunkData,
-                                                                                   uiDownloadSize, chunkChecksum, bDownload);
-
-                                break;
-                            }
-                            case CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_SCRIPT:
-                                pDownloadableResource = pResource->AddResourceFile(CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_SCRIPT, szChunkData,
-                                                                                   uiDownloadSize, chunkChecksum, true);
+                                case CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_FILE:
+                                {
+                                    bool bDownload = bitStream.ReadBit();
+                                    pDownloadableResource = pResource->AddResourceFile(CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_FILE, szChunkData,
+                                                                                       uiDownloadSize, chunkChecksum, bDownload);
 
-                                break;
-                            case CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_CONFIG:
-                                pDownloadableResource = pResource->AddConfigFile(szChunkData, uiDownloadSize, chunkChecksum);
+                                    break;
+                                }
+                                case CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_SCRIPT:
+                                    pDownloadableResource = pResource->AddResourceFile(CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_SCRIPT, szChunkData,
+                                                                                       uiDownloadSize, chunkChecksum, true);
 
-                                break;
-                            default:
+                                    break;
+                                case CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_CONFIG:
+                                    pDownloadableResource = pResource->AddConfigFile(szChunkData, uiDownloadSize, chunkChecksum);
 
-                                break;
-                        }
+                                    break;
+                                default:
 
-                        // Does the Client and Server checksum differ?
-                        if (pDownloadableResource && !pDownloadableResource->DoesClientAndServerChecksumMatch())
-                        {
-                            // Delete the file that already exists
-                            FileDelete(pDownloadableResource->GetName());
-                            if (FileExists(pDownloadableResource->GetName()))
-                            {
-                                SString strMessage("Unable to delete old file %s", *ConformResourcePath(pDownloadableResource->GetName()));
-                                g_pClientGame->TellServerSomethingImportant(1009, strMessage);
+                                    break;
                             }
 
-                            // Is it downloadable now?
-                            if (pDownloadableResource->IsAutoDownload())
+                            // Does the Client and Server checksum differ?
+                            if (pDownloadableResource && !pDownloadableResource->DoesClientAndServerChecksumMatch())
                             {
-                                // Make sure the directory exists
-                                MakeSureDirExists(pDownloadableResource->GetName());
+                                // Delete the file that already exists
+                                FileDelete(pDownloadableResource->GetName());
+                                if (FileExists(pDownloadableResource->GetName()))
+                                {
+                                    SString strMessage("Unable to delete old file %s", *ConformResourcePath(pDownloadableResource->GetName()));
+                                    g_pClientGame->TellServerSomethingImportant(1009, strMessage);
+                                }
 
-                                // Queue the file to be downloaded
-                                g_pClientGame->GetResourceFileDownloadManager()->AddPendingFileDownload(pDownloadableResource);
+                                // Is it downloadable now?
+                                if (pDownloadableResource->IsAutoDownload())
+                                {
+                                    // Make sure the directory exists
+                                    MakeSureDirExists(pDownloadableResource->GetName());
+
+                                    // Queue the file to be downloaded
+                                    g_pClientGame->GetResourceFileDownloadManager()->AddPendingFileDownload(pDownloadableResource);
+                                }
                             }
                         }
                     }
@@ -5116,17 +5137,25 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
                 delete[] szChunkData;
                 szChunkData = NULL;
             }
-        }
 
-        g_pClientGame->GetResourceFileDownloadManager()->UpdatePendingDownloads();
+            if (bFatalError)
+            {
+                break;
+            }
+        }
 
-        // Are there any resources to being downloaded?
-        if (!g_pClientGame->GetResourceFileDownloadManager()->IsTransferringInitialFiles())
+        if (!bFatalError)
         {
-            // Load the resource now
-            if (pResource->CanBeLoaded())
+            g_pClientGame->GetResourceFileDownloadManager()->UpdatePendingDownloads();
+
+            // Are there any resources to being downloaded?
+            if (!g_pClientGame->GetResourceFileDownloadManager()->IsTransferringInitialFiles())
             {
-                pResource->Load();
+                // Load the resource now
+                if (pResource->CanBeLoaded())
+                {
+                    pResource->Load();
+                }
             }
         }
     }
@@ -5136,6 +5165,11 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
 
     g_pCore->UpdateDummyProgress(0);
     totalSizeProcessedResetTimer.Reset();
+
+    if (bFatalError)
+    {
+        RaiseFatalError(2081);
+    }
 }
 
 void CPacketHandler::Packet_ResourceStop(NetBitStreamInterface& bitStream)