Merge branch 'master' into bugfix/heli_rotor_speed

FileEX · web-flow · commit 57d579b44b33 · 2024-08-09T22:43:26.000+02:00
diff --git a/Client/core/CCore.cpp b/Client/core/CCore.cpp
@@ -894,30 +894,6 @@ void CCore::SetCenterCursor(bool bEnabled)
         m_pSetCursorPosHook->DisableSetCursorPos();
 }
 
-// Changes visibility of the system mouse cursor within application window
-void CCore::SetSystemCursorVisible(bool bVisible)
-{
-    if (m_pMultiplayer)
-    {
-        m_pMultiplayer->AllowWindowsCursorShowing(bVisible);
-        ShowCursor(bVisible);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////
-//
-// ShouldShowSystemCursorDuringLoad
-//
-// Whenever system cursor should be shown during game load.
-// It should be if game is being launched in windowed mode or user has multiple monitors and full screen minimize is disabled.
-//
-////////////////////////////////////////////////////////////////////////
-bool CCore::ShouldShowSystemCursorDuringLoad()
-{
-    CVideoModeManagerInterface* pVidMan = GetVideoModeManager();
-    return pVidMan->IsDisplayModeWindowed() || (pVidMan->IsMultiMonitor() && !pVidMan->IsMinimizeEnabled());
-}
-
 ////////////////////////////////////////////////////////////////////////
 //
 // LoadModule
@@ -1044,11 +1020,6 @@ void CCore::DeinitGUI()
 void CCore::InitGUI(IDirect3DDevice9* pDevice)
 {
     m_pGUI = InitModule<CGUI>(m_GUIModule, "GUI", "InitGUIInterface", pDevice);
-
-    SetSystemCursorVisible(ShouldShowSystemCursorDuringLoad());
-
-    // Hide GUI mouse cursor during game startup
-    m_pGUI->SetCursorEnabled(false);
 }
 
 void CCore::CreateGUI()
@@ -1290,9 +1261,6 @@ void CCore::DoPostFramePulse()
             {
                 m_bFirstFrame = false;
 
-                // Make sure system mouse cursor is not visible
-                CCore::GetSingletonPtr()->SetSystemCursorVisible(false);
-
                 // Disable vsync while it's all dark
                 m_pGame->DisableVSync();
 
diff --git a/Client/core/CCore.h b/Client/core/CCore.h
@@ -143,8 +143,6 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     bool IsCursorControlsToggled() { return m_bCursorToggleControls; }
     void HideMainMenu();
     void SetCenterCursor(bool bEnabled);
-    void SetSystemCursorVisible(bool bVisible);
-    bool ShouldShowSystemCursorDuringLoad();
 
     void ShowServerInfo(unsigned int WindowType);
 
diff --git a/Client/core/CGUI.cpp b/Client/core/CGUI.cpp
@@ -44,8 +44,6 @@ CLocalGUI::CLocalGUI()
 
     m_LastSettingsRevision = -1;
     m_LocaleChangeCounter = 0;
-
-    m_StoredMousePosition = {-1, -1};
 }
 
 CLocalGUI::~CLocalGUI()
@@ -713,7 +711,8 @@ bool CLocalGUI::InputGoesToGUI()
 
     // Here we're supposed to check if things like menues are up, console is up or the chatbox is expecting input
     // If the console is visible OR the chat is expecting input OR the mainmenu is visible
-    return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || pGUI->GetGUIInputEnabled() || IsWebRequestGUIVisible());
+    return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || pGUI->GetGUIInputEnabled() ||
+            !CCore::GetSingleton().IsFocused() || IsWebRequestGUIVisible());
 }
 
 void CLocalGUI::ForceCursorVisible(bool bVisible)
@@ -727,18 +726,14 @@ void CLocalGUI::UpdateCursor()
 
     static DWORD dwWidth = CDirect3DData::GetSingleton().GetViewportWidth();
     static DWORD dwHeight = CDirect3DData::GetSingleton().GetViewportHeight();
-    static bool bFirstRun = true;
+    static bool  bFirstRun = true;
 
     if (bFirstRun)
     {
-        if (!CCore::GetSingleton().ShouldShowSystemCursorDuringLoad())
-        {
-            m_StoredMousePosition.x = dwWidth / 2;
-            m_StoredMousePosition.y = dwHeight / 2;
-        }
+        m_StoredMousePosition.x = dwWidth / 2;
+        m_StoredMousePosition.y = dwHeight / 2;
         bFirstRun = false;
     }
-
     // Called in each frame to make sure the mouse is only visible when a GUI control that uses the
     // mouse requires it.
     if (InputGoesToGUI())
@@ -751,8 +746,7 @@ void CLocalGUI::UpdateCursor()
             CCore::GetSingleton ().GetGame ()->GetPad ()->Clear ();*/
 
             // Restore the mouse cursor to its old position
-            if (m_StoredMousePosition.x != -1 && m_StoredMousePosition.y != -1)
-                SetCursorPos(m_StoredMousePosition.x, m_StoredMousePosition.y);
+            SetCursorPos(m_StoredMousePosition.x, m_StoredMousePosition.y);
 
             // Enable our mouse cursor
             CSetCursorPosHook::GetSingleton().DisableSetCursorPos();
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -5590,7 +5590,7 @@ void CClientGame::ResetMapInfo()
     if (pPlayerInfo)
         pPlayerInfo->SetCamDrunkLevel(static_cast<byte>(0));
 
-    RestreamWorld(true);
+    RestreamWorld();
 
     ReinitMarkers();
 }
@@ -6813,7 +6813,7 @@ void CClientGame::RestreamModel(unsigned short usModel)
             m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(usModel);
 }
 
-void CClientGame::RestreamWorld(bool removeBigBuildings)
+void CClientGame::RestreamWorld()
 {
     unsigned int numberOfFileIDs = g_pGame->GetCountOfAllFileIDs();
 
@@ -6826,9 +6826,7 @@ void CClientGame::RestreamWorld(bool removeBigBuildings)
     m_pManager->GetPedManager()->RestreamAllPeds();
     m_pManager->GetPickupManager()->RestreamAllPickups();
 
-    if (removeBigBuildings)
-        g_pGame->GetStreaming()->RemoveBigBuildings();
-
+    g_pGame->GetStreaming()->RemoveBigBuildings();
     g_pGame->GetStreaming()->ReinitStreaming();
 }
 
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -441,7 +441,7 @@ class CClientGame
 
     bool TriggerBrowserRequestResultEvent(const std::unordered_set<SString>& newPages);
     void RestreamModel(unsigned short usModel);
-    void RestreamWorld(bool removeBigBuildings);
+    void RestreamWorld();
     void ReinitMarkers();
 
     void OnWindowFocusChange(bool state);
diff --git a/Client/mods/deathmatch/logic/CClientIMG.cpp b/Client/mods/deathmatch/logic/CClientIMG.cpp
@@ -191,7 +191,7 @@ bool CClientIMG::StreamDisable()
 
     m_pImgManager->UpdateStreamerBufferSize();
 
-    g_pClientGame->RestreamWorld(true);
+    g_pClientGame->RestreamWorld();
     return true;
 }
 
diff --git a/Client/mods/deathmatch/logic/CScriptFile.cpp b/Client/mods/deathmatch/logic/CScriptFile.cpp
@@ -158,7 +158,8 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
     DoResourceFileCheck();
 
     // If read size is large, limit it to how many bytes can be read (avoid memory problems with over allocation)
-    if (ulSize > 10000)
+    // large : >10KB
+    if (ulSize > 10240)
     {
         long lCurrentPos = m_pFile->FTell();
         m_pFile->FSeek(0, SEEK_END);
@@ -177,7 +178,18 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
         return -2;
     }
 
-    return m_pFile->FRead(outBuffer.data(), ulSize);
+    auto bytesRead = m_pFile->FRead(outBuffer.data(), ulSize);
+
+    // EOF reached?
+    // Cant check for error as binary interface
+    // is pure virtual class with no definitions
+    // available (CNetServer)
+    if (m_pFile->FEof())
+    {
+        // if so, truncate the data to the amount of bytes read
+        outBuffer.resize(bytesRead + 1);
+    }
+    return bytesRead;
 }
 
 long CScriptFile::Write(unsigned long ulSize, const char* pData)
diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp b/Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp
@@ -1268,6 +1268,11 @@ void CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisRe
     // No operation on the client
 }
 
+std::pair<bool, std::string> CheckCanModifyOtherResource(CResource* pThisResource, CResource* pOtherResource) noexcept
+{
+    return {true, ""};
+}
+
 //
 // Set error if pThisResource does not have permission to modify every resource in resourceList
 //
@@ -1276,6 +1281,11 @@ void CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisR
     // No operation on the client
 }
 
+std::pair<bool, std::string> CheckCanModifyOtherResources(CResource* pThisResource, std::initializer_list<CResource*> resourceList) noexcept
+{
+    return {true, ""};
+}
+
 //
 // Set error if resource file access is blocked due to reasons
 //
@@ -1284,3 +1294,8 @@ void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pTh
 {
     // No operation on the client
 }
+
+std::pair<bool, std::string> CheckCanAccessOtherResourceFile(CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath, bool* pbReadOnly) noexcept
+{
+    return {true, ""};
+}
diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h b/Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h
@@ -590,9 +590,13 @@ void ReadPregFlags(CScriptArgReader& argStream, pcrecpp::RE_Options& pOptions);
 // Resource access helpers
 //
 void CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource);
+std::pair<bool, std::string> CheckCanModifyOtherResource(CResource* pThisResource, CResource* pOtherResource) noexcept;
 void CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisResource, std::initializer_list<CResource*> resourceList);
-void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
+std::pair<bool, std::string> CheckCanModifyOtherResources(CResource* pThisResource, std::initializer_list<CResource*> resourceList) noexcept;
+    void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
                                      bool* pbReadOnly = nullptr);
+std::pair<bool, std::string> CheckCanAccessOtherResourceFile(CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
+                                                             bool* pbReadOnly = nullptr) noexcept;
 
 //
 // Other misc helpers
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp
@@ -2428,14 +2428,9 @@ bool CLuaEngineDefs::EngineResetModelFlags(uint uiModelID)
     return false;
 }
 
-bool CLuaEngineDefs::EngineRestreamWorld(lua_State* const luaVM)
+bool CLuaEngineDefs::EngineRestreamWorld()
 {
-    bool restreamLODs{};
-
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadBool(restreamLODs, false);
-
-    g_pClientGame->RestreamWorld(restreamLODs);
+    g_pClientGame->RestreamWorld();
     return true;
 }
 
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h
@@ -76,7 +76,7 @@ class CLuaEngineDefs : public CLuaDefs
     static bool                                            EngineRestoreTXDImage(uint uiModelID);
     static std::vector<std::string_view>                   EngineImageGetFileList(CClientIMG* pImg);
     static std::string                                     EngineImageGetFile(CClientIMG* pImg, std::variant<size_t, std::string_view> file);
-    static bool                                            EngineRestreamWorld(lua_State* const luaVM);
+    static bool                                            EngineRestreamWorld();
     static bool                                            EngineSetModelVisibleTime(std::string strModelId, char cHourOn, char cHourOff);
     static std::variant<bool, CLuaMultiReturn<char, char>> EngineGetModelVisibleTime(std::string strModelId);
 
diff --git a/Client/multiplayer_sa/CMultiplayerSA.cpp b/Client/multiplayer_sa/CMultiplayerSA.cpp
@@ -1558,9 +1558,6 @@ void CMultiplayerSA::InitHooks()
     // by skipping some entity flag check in CShadows::CastPlayerShadowSectorList()
     MemSet((void*)0x70A4CB, 0x90, 6);
 
-    // Disable setting system mouse cursor position to the center on game init
-    MemSet((void*)0x748A01, 0x90, 0x748A23 - 0x748A01);
-  
     // Allow vertical camera movement during a camera fade (#411)
     MemPut<BYTE>(0x524084, 0xFF);
     MemPut<BYTE>(0x524089, 0xFF);
diff --git a/Server/mods/deathmatch/logic/CScriptFile.cpp b/Server/mods/deathmatch/logic/CScriptFile.cpp
@@ -178,7 +178,8 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
         return -1;
 
     // If read size is large, limit it to how many bytes can be read (avoid memory problems with over allocation)
-    if (ulSize > 10000)
+    // large : >10KB
+    if (ulSize > 10240)
     {
         long lCurrentPos = ftell(m_pFile);
         fseek(m_pFile, 0, SEEK_END);
@@ -197,7 +198,15 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
         return -2;
     }
 
-    return fread(outBuffer.data(), 1, ulSize, m_pFile);
+    auto bytesRead = fread(outBuffer.data(), 1, ulSize, m_pFile);
+
+    // EOF reached or error was thrown?
+    if (feof(m_pFile) || ferror(m_pFile))
+    {
+        // if so, truncate the data to the amount of bytes read
+        outBuffer.resize(bytesRead + 1);
+    }
+    return bytesRead;
 }
 
 long CScriptFile::Write(unsigned long ulSize, const char* pData)
diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp b/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp
@@ -746,6 +746,17 @@ void CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisRe
             "Access denied");
 }
 
+std::pair<bool, SString> CheckCanModifyOtherResource(CResource* pThisResource, CResource* pOtherResource) noexcept
+{
+    if (GetResourceModifyScope(pThisResource, pOtherResource) != eResourceModifyScope::NONE)
+        return {true, ""};
+
+    SString str("ModifyOtherObjects in ACL denied resource %s to access %s",
+        pThisResource->GetName().c_str(), pOtherResource->GetName().c_str()
+    );
+    return {false, str};
+}
+
 //
 // Set error if pThisResource does not have permission to modify every resource in resourceList
 //
@@ -787,6 +798,46 @@ void CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisR
         SString("ModifyOtherObjects in ACL denied resource %s to access %s", pThisResource->GetName().c_str(), ssResourceNames.str().c_str()), "Access denied");
 }
 
+std::pair<bool, SString> CheckCanModifyOtherResources(CResource* pThisResource, std::initializer_list<CResource*> resourceList) noexcept
+{
+    // std::unordered_set only allows unique values and resourceList can contain duplicates
+    std::unordered_set<CResource*> setNoPermissionResources;
+
+    for (const auto& pOtherResource : resourceList)
+    {
+        eResourceModifyScope modifyScope = GetResourceModifyScope(pThisResource, pOtherResource);
+
+        if (modifyScope == eResourceModifyScope::SINGLE_RESOURCE)
+            continue;
+
+        if (modifyScope == eResourceModifyScope::EVERY_RESOURCE)
+            return {true, ""};
+
+        setNoPermissionResources.emplace(pOtherResource);
+    }
+
+    if (setNoPermissionResources.empty())
+        return {true, ""};
+
+    std::stringstream ssResourceNames;
+    std::size_t       remainingElements = setNoPermissionResources.size();
+
+    for (const auto& pResource : setNoPermissionResources)
+    {
+        ssResourceNames << pResource->GetName();
+
+        if (remainingElements > 1)
+            ssResourceNames << ", ";
+
+        --remainingElements;
+    }
+
+    SString str("ModifyOtherObjects in ACL denied resource %s to access %s",
+        pThisResource->GetName().c_str(), ssResourceNames.str().c_str()
+    );
+    return {false, str};
+}
+
 //
 // Set error if resource file access is blocked due to reasons
 //
@@ -813,3 +864,28 @@ void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pTh
             SString("Database credentials protection denied resource %s to access %s", *pThisResource->GetName(), *pOtherResource->GetName()), "Access denied");
     }
 }
+
+std::pair<bool, SString> CheckCanAccessOtherResourceFile(CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath, bool* pbReadOnly) noexcept
+{
+    if (!g_pGame->GetConfig()->IsDatabaseCredentialsProtectionEnabled())
+        return {true, ""};
+
+    // Is other resource different and requested access denied
+    if (pThisResource == pOtherResource)
+        return {true, ""};
+
+    if (!pOtherResource->IsFileDbConnectMysqlProtected(strAbsPath, pbReadOnly ? *pbReadOnly : false))
+        return {true, ""};
+
+    // No access - See if we can change to readonly
+    if (pbReadOnly && !(*pbReadOnly) && !pOtherResource->IsFileDbConnectMysqlProtected(strAbsPath, true)) {
+        // Yes readonly access
+        *pbReadOnly = true;
+        return {true, ""};
+    }
+
+    SString str("Database credentials protection denied resource %s to access %s",
+        *pThisResource->GetName(), *pOtherResource->GetName()
+    );
+    return {false, str};
+}
diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h b/Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h
diff --git a/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot b/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot
diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp
diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h
diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua

Original file line number	Diff line number	Diff line change
`@@ -5590,7 +5590,7 @@ void CClientGame::ResetMapInfo()`
`5590`	`5590`	`if (pPlayerInfo)`
`5591`	`5591`	`pPlayerInfo->SetCamDrunkLevel(static_cast<byte>(0));`
`5592`	`5592`
`5593`		`- RestreamWorld(true);`
	`5593`	`+ RestreamWorld();`
`5594`	`5594`
`5595`	`5595`	`ReinitMarkers();`
`5596`	`5596`	`}`
`@@ -6813,7 +6813,7 @@ void CClientGame::RestreamModel(unsigned short usModel)`
`6813`	`6813`	`m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(usModel);`
`6814`	`6814`	`}`
`6815`	`6815`
`6816`		`-void CClientGame::RestreamWorld(bool removeBigBuildings)`
	`6816`	`+void CClientGame::RestreamWorld()`
`6817`	`6817`	`{`
`6818`	`6818`	`unsigned int numberOfFileIDs = g_pGame->GetCountOfAllFileIDs();`
`6819`	`6819`
`@@ -6826,9 +6826,7 @@ void CClientGame::RestreamWorld(bool removeBigBuildings)`
`6826`	`6826`	`m_pManager->GetPedManager()->RestreamAllPeds();`
`6827`	`6827`	`m_pManager->GetPickupManager()->RestreamAllPickups();`
`6828`	`6828`
`6829`		`- if (removeBigBuildings)`
`6830`		`- g_pGame->GetStreaming()->RemoveBigBuildings();`
`6831`		`-`
	`6829`	`+ g_pGame->GetStreaming()->RemoveBigBuildings();`
`6832`	`6830`	`g_pGame->GetStreaming()->ReinitStreaming();`
`6833`	`6831`	`}`
`6834`	`6832`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ bool CClientIMG::StreamDisable()`
`191`	`191`
`192`	`192`	`m_pImgManager->UpdateStreamerBufferSize();`
`193`	`193`
`194`		`- g_pClientGame->RestreamWorld(true);`
	`194`	`+ g_pClientGame->RestreamWorld();`
`195`	`195`	`return true;`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -2428,14 +2428,9 @@ bool CLuaEngineDefs::EngineResetModelFlags(uint uiModelID)`
`2428`	`2428`	`return false;`
`2429`	`2429`	`}`
`2430`	`2430`
`2431`		`-bool CLuaEngineDefs::EngineRestreamWorld(lua_State* const luaVM)`
	`2431`	`+bool CLuaEngineDefs::EngineRestreamWorld()`
`2432`	`2432`	`{`
`2433`		`- bool restreamLODs{};`
`2434`		`-`
`2435`		`- CScriptArgReader argStream(luaVM);`
`2436`		`- argStream.ReadBool(restreamLODs, false);`
`2437`		`-`
`2438`		`- g_pClientGame->RestreamWorld(restreamLODs);`
	`2433`	`+ g_pClientGame->RestreamWorld();`
`2439`	`2434`	`return true;`
`2440`	`2435`	`}`
`2441`	`2436`