Merge branch 'master' into refactor/CWeaponSA

Author: Dutchman101

.github/workflows/crowdin-auto-merge.yml

@@ -0,0 +1,31 @@
+name: Crowdin Auto-Merge
+
+on:
+  schedule:
+    - cron: '0 0 * * 5'  # This cron expression runs the workflow every Friday at midnight (UTC)
+  workflow_dispatch:
+
+jobs:
+  crowdin-auto-merge:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Git
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Auto-merge pull request
+        run: |
+          PR_NUMBER=$(gh pr list --repo ${{ github.repository }} --author 'MTABot' --base 'master' --head 'l10n/master' --state open --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr merge $PR_NUMBER --squash --repo ${{ github.repository }} --admin --subject "New Crowdin updates (PR #$PR_NUMBER)" --body ""
+            git push origin --delete l10n/master
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dockerimage.yaml

@@ -26,6 +26,7 @@ jobs:
           dockerfile: Dockerfile.armhf
         - tag: arm64
           dockerfile: Dockerfile.arm64
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

.github/workflows/rebuild-pots.yaml

@@ -4,6 +4,7 @@ on: [push, workflow_dispatch]
 
 jobs:
   test:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -23,6 +24,7 @@ jobs:
         run: pytest "utils/localization/tests"
         shell: bash -l {0}
   rebuild-pots:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     needs: test
     steps:

.github/workflows/stale.yaml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   stale:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: multitheftauto/[email protected]

.github/workflows/sync-master-to-maetro.yaml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   sync-master-to-maetro:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

Client/game_sa/CPedSA.cpp

@@ -1120,3 +1120,9 @@ void CPedSA::GetAttachedSatchels(std::vector<SSatchelsData>& satchelsList) const
         satchelsList.push_back({pProjectileInterface, &pProjectileInterface->m_vecAttachedOffset, &pProjectileInterface->m_vecAttachedRotation});
     }
 }
+
+void CPedSA::Say(const ePedSpeechContext& speechId, float probability)
+{
+    // Call CPed::Say
+    ((void(__thiscall*)(CPedSAInterface*, ePedSpeechContext, int, float, bool, bool, bool))FUNC_CPed_Say)(GetPedInterface(), speechId, 0, probability, false, false, false);
+}

Client/game_sa/CPedSA.h

@@ -59,6 +59,7 @@ class CPedIntelligenceSAInterface;
 #define FUNC_DetachPedFromEntity        0x5E7EC0
 #define FUNC_CPed_RemoveBodyPart        0x5f0140
 #define FUNC_PreRenderAfterTest         0x5E65A0
+#define FUNC_CPed_Say                   0x5EFFE0
 
 #define VAR_LocalPlayer                 0x94AD28
 
@@ -419,4 +420,6 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
     ePedState           GetPedState() { return GetPedInterface()->pedState; }
 
     void GetAttachedSatchels(std::vector<SSatchelsData> &satchelsList) const override;
+
+    void Say(const ePedSpeechContext& speechId, float probability) override;
 };

Client/loader-proxy/exports.def

@@ -1,5 +1,5 @@
 EXPORTS
-    timeBeginPeriod=noreturn
-    timeEndPeriod=noreturn
-    timeGetDevCaps=noreturn
-    timeGetTime=noreturn
+    timeBeginPeriod=winmm.timeBeginPeriod
+    timeEndPeriod=winmm.timeEndPeriod
+    timeGetDevCaps=winmm.timeGetDevCaps
+    timeGetTime=winmm.timeGetTime

Client/loader-proxy/main.cpp

@@ -47,7 +47,6 @@ BOOL OnLibraryAttach();
 auto SetImportProcAddress(const char* moduleName, const char* procedureName, FARPROC replacement) -> FARPROC;
 void DisplayErrorMessageBox(const std::wstring& message, const std::wstring& errorCode);
 bool DisplayWarningMessageBox(const std::wstring& message, const std::wstring& errorCode);
-auto PatchWinmmImports() -> int;
 auto GetSystemErrorMessage(DWORD errorCode) -> std::wstring;
 auto GetCurrentProcessPath() -> fs::path;
 auto GetParentProcessPath() -> fs::path;
@@ -232,29 +231,6 @@ VOID OnGameLaunch()
         return;
     }
 
-    // Patch the winmm.dll imports we've taken over with our mtasa.dll library back to the functions from the winmm.dll library.
-    if (int error = PatchWinmmImports())
-    {
-        std::wstring message;
-
-        switch (error)
-        {
-            case 1:
-                message = L"Loading system-provided winmm.dll failed.";
-                break;
-            case 4:
-                message = L"Unable to find winmm.dll import entry.";
-                break;
-            default:
-                message = L"Patching winmm.dll imports failed.";
-                break;
-        }
-
-        AddLaunchLog("Patching imports has failed (%d)", error);
-        DisplayErrorMessageBox(MakeMissingFilesError(message), L"CL58");
-        return;
-    }
-
     // For dll searches, this call replaces the current directory entry and turns off 'SafeDllSearchMode'.
     // Meaning it will search the supplied path before the system and windows directory.
     // http://msdn.microsoft.com/en-us/library/ms682586%28VS.85%29.aspx
@@ -357,15 +333,6 @@ BOOL WINAPI MyGetVersionExA(LPOSVERSIONINFOA versionInfo)
     return result;
 }
 
-/**
- * @brief A placeholder function for fake winmm.dll exports.
- */
-EXTERN_C void noreturn()
-{
-    // We should never enter this function.
-    assert(false);
-}
-
 /**
  * @brief Replaces an import library procedure with the given replacement function.
  * @param moduleName Name of the import library (case-insensitive)
@@ -596,81 +563,6 @@ auto GetParentProcessPath() -> fs::path
     return GetProcessPath(GetParentProcessId());
 }
 
-/**
- * @brief Loads the winmm.dll library.
- * @return A handle to the library
- */
-auto LoadWinmmLibrary() -> HMODULE
-{
-    if (HMODULE winmm = LoadLibraryExW(L"winmm.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32))
-        return winmm;
-
-    return LoadLibraryW(L"winmm.dll");
-}
-
-/**
- * @brief Replaces fake mtasa.dll imports with functions retrieved from the winmm.dll library.
- */
-auto PatchWinmmImports() -> int
-{
-    auto base = reinterpret_cast<std::byte*>(g_exe);
-    auto dos = reinterpret_cast<IMAGE_DOS_HEADER*>(base);
-    auto nt = reinterpret_cast<IMAGE_NT_HEADERS32*>(base + dos->e_lfanew);
-    auto descriptor = reinterpret_cast<IMAGE_IMPORT_DESCRIPTOR*>(base + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
-
-    // Iterate through the import descriptors and find the winmm.dll entry, which we renamed to mtasa.dll.
-    for (; descriptor->Name; ++descriptor)
-    {
-        auto name = reinterpret_cast<const char*>(base + descriptor->Name);
-
-        if (stricmp("mtasa.dll", name))
-            continue;
-
-        HMODULE winmm = LoadWinmmLibrary();
-
-        if (!winmm)
-            return 1;
-
-        auto nameTableEntry = reinterpret_cast<DWORD*>(base + descriptor->FirstThunk);
-        auto addressTableEntry = reinterpret_cast<FARPROC*>(nameTableEntry);
-
-        if (descriptor->OriginalFirstThunk)
-            nameTableEntry = reinterpret_cast<DWORD*>(base + descriptor->OriginalFirstThunk);
-
-        // Replace every import with the correct function from the winmm.dll library.
-        for (; *nameTableEntry; ++nameTableEntry, ++addressTableEntry)
-        {
-            const char* functionName;
-
-            if (IMAGE_SNAP_BY_ORDINAL(*nameTableEntry))
-            {
-                functionName = reinterpret_cast<char const*>(IMAGE_ORDINAL(*nameTableEntry));
-            }
-            else
-            {
-                functionName = reinterpret_cast<IMAGE_IMPORT_BY_NAME*>(base + *nameTableEntry)->Name;
-            }
-
-            if (!functionName)
-                return 2;
-
-            FARPROC function = GetProcAddress(winmm, functionName);
-
-            if (!function)
-                return 3;
-
-            DWORD protection;
-            VirtualProtect(addressTableEntry, sizeof(FARPROC), PAGE_READWRITE, &protection);
-            *addressTableEntry = function;
-            VirtualProtect(addressTableEntry, sizeof(FARPROC), protection, &protection);
-        }
-
-        return 0;
-    }
-
-    return 4;
-}
-
 /**
  * @brief Transforms the numeric error code into a system-generated error string.
  */

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -5272,6 +5272,14 @@ void CClientPed::Respawn(CVector* pvecPosition, bool bRestoreState, bool bCamera
     }
 }
 
+void CClientPed::Say(const ePedSpeechContext& speechId, float probability)
+{
+    if (!m_pPlayerPed)
+        return;
+
+    m_pPlayerPed->Say(speechId, probability);
+}
+
 const char* CClientPed::GetBodyPartName(unsigned char ucID)
 {
     if (ucID <= 10)