Merge branch 'master' into next

Author: patrikjuvonen

.github/workflows/build.yaml

@@ -4,9 +4,12 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  windows-release:
-    name: windows-release
-    runs-on: windows-2019
+  windows:
+    strategy:
+      matrix:
+        type: [release, debug]
+    name: windows-${{ matrix.type }}
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
 
@@ -32,51 +35,16 @@ jobs:
       - name: Install data files
         run: utils\premake5 install_data
 
-      - name: Run Build
+      - name: Run Build [Release]
+        if: ${{ matrix.type == 'release' }}
         run: win-build.bat
         shell: cmd
         env:
           DXSDK_DIR: './utils/DXFiles/'
           CI: 'true'
 
-      - name: Create build artifacts
-        run: utils\premake5 compose_files
-
-      - uses: actions/upload-artifact@master
-        with:
-          name: InstallFiles
-          path: InstallFiles/
-
-
-  windows-debug:
-    name: windows-debug
-    runs-on: windows-2019
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/cache@v1
-        id: cache-dxfiles
-        with:
-          path: utils/DXFiles
-          key: dxfiles-0001
-
-      - name: Download DirectX
-        if: steps.cache-dxfiles.outputs.cache-hit != 'true'
-        run: Invoke-WebRequest https://mirror.mtasa.com/bdata/DXFiles.zip -OutFile utils/DXFiles.zip
-        shell: powershell
-
-      - name: Extract DirectX
-        if: steps.cache-dxfiles.outputs.cache-hit != 'true'
-        run: Expand-Archive -Path utils/DXFiles.zip -DestinationPath utils/DXFiles
-        shell: powershell
-
-      - name: Install CEF
-        run: utils\premake5 install_cef
-
-      - name: Install data files
-        run: utils\premake5 install_data
-
-      - name: Run Build
+      - name: Run Build [Debug]
+        if: ${{ matrix.type == 'debug' }}
         run: win-build.bat Debug
         shell: cmd
         env:
@@ -87,52 +55,56 @@ jobs:
         run: utils\premake5 compose_files
 
       - uses: actions/upload-artifact@master
+        if: ${{ matrix.type == 'release' }}
+        with:
+          name: InstallFiles
+          path: InstallFiles/
+
+      - uses: actions/upload-artifact@master
+        if: ${{ matrix.type == 'debug' }}
         with:
           name: InstallFiles-debug
           path: InstallFiles/
 
-  macOS-release:
-    name: macOS-release
+  macOS:
+    strategy:
+      matrix:
+        type: [release, debug]
+    name: macOS-${{ matrix.type }}
     runs-on: macOS-latest
     steps:
-      - name: Install MySQL
-        run: brew install mysql
-        continue-on-error: true
-      - name: Link MySQL
-        run: brew link --overwrite mysql
       - uses: actions/checkout@v2
-      - name: Run Build
-        run: ./linux-build.sh
 
-  macOS-debug:
-    name: macOS-debug
-    runs-on: macOS-latest
-    steps:
       - name: Install MySQL
         run: brew install mysql
         continue-on-error: true
+
       - name: Link MySQL
         run: brew link --overwrite mysql
-      - uses: actions/checkout@v2
-      - name: Run Build
+
+      - name: Run Build [Release]
+        if: ${{ matrix.type == 'release' }}
+        run: ./linux-build.sh
+
+      - name: Run Build [Debug]
+        if: ${{ matrix.type == 'debug' }}
         run: ./linux-build.sh "" debug
 
-  linux-release:
-    name: linux-release
+  linux:
+    strategy:
+      matrix:
+        type: [release, debug]
+    name: linux-${{ matrix.type }}
     runs-on: ubuntu-latest
     container:
       image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
     steps:
       - uses: actions/checkout@v2
-      - name: Run Build
+
+      - name: Run Build [Release]
+        if: ${{ matrix.type == 'release' }}
         run: ./linux-build.sh
 
-  linux-debug:
-    name: linux-debug
-    runs-on: ubuntu-latest
-    container:
-      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run Build
-        run: ./linux-build.sh "" debug
+      - name: Run Build [Debug]
+        if: ${{ matrix.type == 'debug' }}
+        run: ./linux-build.sh "" debug

.github/workflows/stale.yaml

@@ -0,0 +1,21 @@
+name: 'Stale draft PR handler'
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: multitheftauto/[email protected]
+        id: stale
+        with:
+          close-pr-message: "This draft pull request was closed because it has been marked stale for 30 days with no activity."
+          days-before-pr-close: 30
+          days-before-pr-stale: 90
+          ignored-label: "keep"
+          stale-pr-label-description: "Inactive for over 90 days, to be closed"
+          stale-pr-message: "This draft pull request is stale because it has been open for at least 90 days with no activity. Please continue on your draft pull request or it will be closed in 30 days automatically."
+      - name: Print outputs
+        run: echo ${{ join(steps.stale.outputs.*, ',') }}

Client/cefweb/CAjaxResourceHandler.cpp

@@ -64,7 +64,7 @@ bool CAjaxResourceHandler::ReadResponse(void* data_out, int bytes_to_read, int&
     {
         bytes_read = 0;
         m_callback = callback;
-        callback->Continue();
+
         return true;
     }
 

Client/cefweb/CWebView.cpp

@@ -52,9 +52,6 @@ void CWebView::Initialise()
     browserSettings.windowless_frame_rate = g_pCore->GetFrameRateLimit();
     browserSettings.javascript_access_clipboard = cef_state_t::STATE_DISABLED;
     browserSettings.javascript_dom_paste = cef_state_t::STATE_DISABLED;
-    browserSettings.universal_access_from_file_urls =
-        cef_state_t::STATE_DISABLED;            // Also filtered by resource interceptor, but set this nevertheless
-    browserSettings.file_access_from_file_urls = cef_state_t::STATE_DISABLED;
     browserSettings.webgl = cef_state_t::STATE_ENABLED;
 
     browserSettings.plugins = cef_state_t::STATE_DISABLED;
@@ -173,10 +170,7 @@ const bool CWebView::GetRenderingPaused() const
 void CWebView::Focus(bool state)
 {
     if (m_pWebView)
-    {
         m_pWebView->GetHost()->SetFocus(state);
-        m_pWebView->GetHost()->SendFocusEvent(state);
-    }
 
     if (state)
         g_pCore->GetWebCore()->SetFocusedWebView(this);
@@ -824,7 +818,7 @@ bool CWebView::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame>
 //                                                                //
 ////////////////////////////////////////////////////////////////////
 CefResourceRequestHandler::ReturnValue CWebView::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
-                                                                      CefRefPtr<CefRequestCallback> callback)
+                                                                      CefRefPtr<CefCallback> callback)
 {
     // Mostly the same as CWebView::OnBeforeBrowse
     CefURLParts urlParts;

Client/cefweb/CWebView.h

@@ -142,7 +142,7 @@ class CWebView : public CWebViewInterface,
 
     // CefResourceRequestHandler
     virtual CefResourceRequestHandler::ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
-                                                                        CefRefPtr<CefRequestCallback> callback) override;
+                                                                        CefRefPtr<CefCallback> callback) override;
 
     // CefLifeSpawnHandler methods
     virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;

Client/core/CChat.cpp

@@ -165,6 +165,15 @@ void CChat::Draw(bool bUseCacheTexture, bool bAllowOutline)
     bool bUsingOutline = m_bTextBlackOutline && bAllowOutline && bUseCacheTexture;
     DrawInputLine(bUsingOutline);
 
+    if (m_bInputVisible)
+    {
+        // ChrML: Hack so chatbox input always works. It might get unfocused..
+        if (!m_pBackground->IsActive())
+        {
+            m_pBackground->Activate();
+        }
+    }
+
     // Are we visible?
     if (!m_bVisible)
         return;
@@ -211,9 +220,8 @@ void CChat::Draw(bool bUseCacheTexture, bool bAllowOutline)
             if (m_iReportCount < 5)
             {
                 m_iReportCount++;
-                SString strAdapterName = g_pDeviceState->AdapterState.Name;
                 AddReportLog(6532, SString("Chat rt chatSize:%2.0f %2.0f   rtsize:%d %d   card:%s", chatSize.fX, chatSize.fY, iRenderTargetSizeX,
-                                           iRenderTargetSizeY, *strAdapterName));
+                                           iRenderTargetSizeY, g_pDeviceState->AdapterState.Name.c_str()));
             }
         }
         m_iCacheTextureRevision = -1;            // Make sure the graphics will be updated
@@ -298,15 +306,6 @@ void CChat::GetDrawList(SDrawList& outDrawList, bool bUsingOutline)
         m_pBackground->SetVisible(false);
     }
 
-    if (m_bInputVisible)
-    {
-        // ChrML: Hack so chatbox input always works. It might get unfocused..
-        if (!m_pBackground->IsActive())
-        {
-            m_pBackground->Activate();
-        }
-    }
-
     // Used for render clipping in CChat::DrawTextString
     CRect2D RenderBounds(m_vecBackgroundPosition.fX, m_vecBackgroundPosition.fY + 1, m_vecBackgroundPosition.fX + m_vecBackgroundSize.fX,
                          m_vecBackgroundPosition.fY + m_vecBackgroundSize.fY);