Revert "Disable CEF on XP and Vista"

This reverts commit 9637463.

Author: jushar

MTA10/core/CCore.cpp

@@ -129,6 +129,7 @@ CCore::CCore ( void )
     m_pGraphics                 = new CGraphics ( m_pLocalGUI );
     g_pGraphics                 = m_pGraphics;
     m_pGUI                      = NULL;
+    m_pWebCore                  = NULL;
 
     // Create the mod manager
     m_pModManager               = new CModManager;
@@ -225,7 +226,7 @@ CCore::~CCore ( void )
     delete m_pGraphics;
 
     // Delete the web
-    SAFE_DELETE ( m_pWebCore );
+    delete m_pWebCore;
 
     // Delete lazy subsystems
     DestroyGUI ();
@@ -1151,8 +1152,7 @@ void CCore::DestroyNetwork ( )
 void CCore::InitialiseWeb ()
 {
     // Don't initialise webcore twice
-    // Also disable webbrowser stuff if this PC still uses deprecated, vulnerable software e.g. XP
-    if ( m_pWebCore || !IsWindows7OrGreater() )
+    if ( m_pWebCore )
         return;
 
     // Ensure DllDirectory has not been changed
@@ -1367,8 +1367,7 @@ void CCore::OnModUnload ( )
     m_uiClientScriptFrameRateLimit = 0;
 
     // Clear web whitelist
-    if ( m_pWebCore )
-        m_pWebCore->ResetFilter ();
+    m_pWebCore->ResetFilter ();
 }
 
 

MTA10/core/CCore.h

@@ -287,7 +287,7 @@ class CCore : public CCoreInterface, public CSingleton < CCore >
     CXMLFile*                   m_pConfigFile;
     CClientVariables            m_ClientVariables;
     CCommunity                  m_Community;
-    CWebCore*                   m_pWebCore = nullptr;
+    CWebCore*                   m_pWebCore;
 
     // Hook interfaces.
     CMessageLoopHook *          m_pMessageLoopHook;

MTA10/core/CDirect3DEvents9.cpp

@@ -147,12 +147,9 @@ void CDirect3DEvents9::OnPresent ( IDirect3DDevice9 *pDevice )
     CGraphics::GetSingleton ().GetRenderItemManager ()->FlushNonAARenderTarget();
 
     bool bTookScreenShot = false;
-    auto pWebCore = g_pCore->GetWebCore ();
     if ( !CGraphics::GetSingleton ().GetScreenGrabber ()->IsQueueEmpty () )
     {
-        if ( pWebCore )
-            pWebCore->OnPreScreenshot ();
-        
+        g_pCore->GetWebCore ()->OnPreScreenshot ();
         bTookScreenShot = true;
     }
 
@@ -162,8 +159,8 @@ void CDirect3DEvents9::OnPresent ( IDirect3DDevice9 *pDevice )
     // Maybe grab screen for upload
     CGraphics::GetSingleton ().GetScreenGrabber ()->DoPulse ();
 
-    if ( bTookScreenShot && pWebCore )
-        pWebCore->OnPostScreenshot ();
+    if ( bTookScreenShot )
+        g_pCore->GetWebCore ()->OnPostScreenshot ();
 
     // Draw the GUI
     CLocalGUI::GetSingleton().Draw ();

MTA10/core/CSettings.cpp

@@ -3011,18 +3011,14 @@ void CSettings::LoadData ( void )
     m_pGridBrowserWhitelist->Clear ();
     m_bBrowserListsChanged = false;
 
-    auto pWebCore = CCore::GetSingleton().GetWebCore();
-    if ( pWebCore )
+    std::vector<std::pair<SString, bool>> customBlacklist;
+    CCore::GetSingleton ().GetWebCore ()->GetFilterEntriesByType ( customBlacklist, eWebFilterType::WEBFILTER_USER );
+    for ( std::vector<std::pair<SString, bool>>::iterator iter = customBlacklist.begin(); iter != customBlacklist.end (); ++iter )
     {
-        std::vector<std::pair<SString, bool>> customBlacklist;
-        pWebCore->GetFilterEntriesByType( customBlacklist, eWebFilterType::WEBFILTER_USER );
-        for ( std::vector<std::pair<SString, bool>>::iterator iter = customBlacklist.begin(); iter != customBlacklist.end(); ++iter )
-        {
-            if ( iter->second == false )
-                m_pGridBrowserBlacklist->SetItemText( m_pGridBrowserBlacklist->AddRow (), 1, iter->first );
-            else
-                m_pGridBrowserWhitelist->SetItemText( m_pGridBrowserWhitelist->AddRow (), 1, iter->first );
-        }
+        if ( iter->second == false )
+            m_pGridBrowserBlacklist->SetItemText ( m_pGridBrowserBlacklist->AddRow (), 1, iter->first );
+        else
+            m_pGridBrowserWhitelist->SetItemText ( m_pGridBrowserWhitelist->AddRow (), 1, iter->first );
     }
 }
 
@@ -3316,27 +3312,21 @@ void CSettings::SaveData ( void )
         CVARS_SET ("browser_plugins", m_pCheckBoxBrowserPluginsEnabled->GetSelected () );
     }
 
-    auto pWebCore = CCore::GetSingleton().GetWebCore();
-    if ( pWebCore )
+    std::vector<SString> customBlacklist;
+    for ( int i = 0; i < m_pGridBrowserBlacklist->GetRowCount (); ++i )
     {
-        std::vector<SString> customBlacklist;
-        for ( int i = 0; i < m_pGridBrowserBlacklist->GetRowCount (); ++i )
-        {
-            customBlacklist.push_back ( m_pGridBrowserBlacklist->GetItemText ( i, 1 ) );
-        }
-        pWebCore->WriteCustomList( "customblacklist", customBlacklist );
-
-        std::vector<SString> customWhitelist;
-        for ( int i = 0; i < m_pGridBrowserWhitelist->GetRowCount(); ++i )
-        {
-            customWhitelist.push_back( m_pGridBrowserWhitelist->GetItemText( i, 1 ) );
-        }
-        pWebCore->WriteCustomList( "customwhitelist", customWhitelist );
-        
-        if ( m_bBrowserListsChanged )
-            bBrowserSettingChanged = true;
+        customBlacklist.push_back ( m_pGridBrowserBlacklist->GetItemText ( i, 1 ) );
     }
+    CCore::GetSingleton ().GetWebCore ()->WriteCustomList ( "customblacklist", customBlacklist );
 
+    std::vector<SString> customWhitelist;
+    for ( int i = 0; i < m_pGridBrowserWhitelist->GetRowCount (); ++i )
+    {
+        customWhitelist.push_back ( m_pGridBrowserWhitelist->GetItemText ( i, 1 ) );
+    }
+    CCore::GetSingleton ().GetWebCore ()->WriteCustomList ( "customwhitelist", customWhitelist );
+    if ( m_bBrowserListsChanged )
+        bBrowserSettingChanged = true;
 
     // Ensure CVARS ranges ok
     CClientVariables::GetSingleton().ValidateValues ();
@@ -4225,4 +4215,4 @@ void CSettings::TabSkip ( bool bBackwards )
 bool CSettings::IsActive ( void )
 {
     return m_pWindow->IsActive ();
-}
+}

MTA10/mods/deathmatch/logic/CClientGame.cpp

@@ -2331,8 +2331,7 @@ bool CClientGame::KeyStrokeHandler ( const SString& strKey, bool bState, bool bI
         bool bIgnore = false;
         if ( bState )
         {
-            auto pWebCore = g_pCore->GetWebCore();
-            auto pFocusedBrowser = pWebCore ? pWebCore->GetFocusedWebView () : nullptr;
+            auto pFocusedBrowser = g_pCore->GetWebCore ()->GetFocusedWebView ();
 
             if ( g_pCore->IsMenuVisible() || ( g_pCore->GetConsole()->IsInputActive() && bIsConsoleInputKey ) || ( pFocusedBrowser && !pFocusedBrowser->IsLocal () ) )
                 bIgnore = true;                         // Ignore this keydown and the matching keyup
@@ -2391,8 +2390,7 @@ bool CClientGame::CharacterKeyHandler ( WPARAM wChar )
     if ( m_pRootEntity && g_pCore->IsMenuVisible() == false && g_pCore->GetConsole()->IsInputActive() == false )
     {
         // Cancel event if remote browser is focused
-        auto pWebCore = g_pCore->GetWebCore();
-        auto pFocusedBrowser = pWebCore ? pWebCore->GetFocusedWebView () : nullptr;
+        auto pFocusedBrowser = g_pCore->GetWebCore ()->GetFocusedWebView ();
         if ( pFocusedBrowser && !pFocusedBrowser->IsLocal () )
             return false;
 
@@ -6330,8 +6328,7 @@ void CClientGame::SetDevelopmentMode ( bool bEnable, bool bEnableWeb )
     else
         g_pGame->GetAudio ()->SetWorldSoundHandler ( NULL );
 
-    if ( g_pCore->GetWebCore() )
-        g_pCore->GetWebCore()->SetTestModeEnabled ( bEnableWeb );
+    g_pCore->GetWebCore()->SetTestModeEnabled ( bEnableWeb );
 }
 
 

MTA10/mods/shared_logic/CClientWebBrowser.cpp

@@ -19,7 +19,6 @@ CClientWebBrowser::CClientWebBrowser ( CClientManager* pManager, ElementID ID, C
     SetTypeName ( "webbrowser" );
 
     // Create the web view
-    assert( g_pCore->GetWebCore() );
     m_pWebView = g_pCore->GetWebCore ()->CreateWebView ( pWebBrowserItem->m_uiSizeX, pWebBrowserItem->m_uiSizeY, bLocal, pWebBrowserItem, bTransparent );
 
     // Set events interface

MTA10/mods/shared_logic/luadefs/CLuaBrowserDefs.cpp

@@ -13,61 +13,37 @@
 
 void CLuaBrowserDefs::LoadFunctions ( void )
 {
-    // Define browser functions
-    std::map<const char*, lua_CFunction> functions
-        {
-            { "createBrowser", CreateBrowser },
-            { "requestBrowserDomains", RequestBrowserDomains },
-            { "loadBrowserURL", LoadBrowserURL },
-            { "isBrowserLoading", IsBrowserLoading },
-            { "injectBrowserMouseMove", InjectBrowserMouseMove },
-            { "injectBrowserMouseDown", InjectBrowserMouseDown },
-            { "injectBrowserMouseUp", InjectBrowserMouseUp },
-            { "injectBrowserMouseWheel", InjectBrowserMouseWheel },
-            { "getBrowserTitle", GetBrowserTitle },
-            { "getBrowserURL", GetBrowserURL },
-            { "setBrowserRenderingPaused", SetBrowserRenderingPaused },
-            { "executeBrowserJavascript", ExecuteBrowserJavascript },
-            { "getBrowserVolume", GetBrowserVolume },
-            { "setBrowserVolume", SetBrowserVolume },
-            { "isBrowserDomainBlocked", IsBrowserDomainBlocked },
-            { "focusBrowser", FocusBrowser },
-            { "isBrowserFocused", IsBrowserFocused },
-            { "setBrowserProperty", SetBrowserProperty },
-            { "getBrowserProperty", GetBrowserProperty },
-            { "getBrowserSettings", GetBrowserSettings },
-            { "getBrowserSource", GetBrowserSource },
-            { "setBrowserAjaxHandler", SetBrowserAjaxHandler },
-            { "canBrowserNavigateBack", CanBrowserNavigateBack },
-            { "canBrowserNavigateForward", CanBrowserNavigateForward },
-            { "navigateBrowserBack", NavigateBrowserBack },
-            { "navigateBrowserForward", NavigateBrowserForward },
-            { "reloadBrowserPage", ReloadBrowserPage },
-            { "toggleBrowserDevTools", ToggleBrowserDevTools },
-            { "guiCreateBrowser", GUICreateBrowser },
-            { "guiGetBrowser", GUIGetBrowser },
-        };
-
-    // Add browser functions
-    if ( IsBrowserSupported () )
-    {
-        for ( const auto& pair : functions )
-        {
-            CLuaCFunctions::AddFunction ( pair.first, pair.second );
-        }
-    }
-    else
-    {
-        for ( const auto& pair : functions )
-        {
-            CLuaCFunctions::AddFunction( pair.first, [](lua_State* luaVM) -> int {
-                g_pCore->DebugPrintfColor ( "Called browser function on unsupported, vulnerable operating system. Please upgrade your OS as soon as possible", 255, 0, 0 );
-                lua_pushboolean ( luaVM, false );
-                return 1;
-            } );
-        }
-    }
-    
+    // Browser functions
+    CLuaCFunctions::AddFunction ( "createBrowser", CreateBrowser );
+    CLuaCFunctions::AddFunction ( "requestBrowserDomains", RequestBrowserDomains );
+    CLuaCFunctions::AddFunction ( "loadBrowserURL", LoadBrowserURL );
+    CLuaCFunctions::AddFunction ( "isBrowserLoading", IsBrowserLoading );
+    CLuaCFunctions::AddFunction ( "injectBrowserMouseMove", InjectBrowserMouseMove );
+    CLuaCFunctions::AddFunction ( "injectBrowserMouseDown", InjectBrowserMouseDown );
+    CLuaCFunctions::AddFunction ( "injectBrowserMouseUp", InjectBrowserMouseUp );
+    CLuaCFunctions::AddFunction ( "injectBrowserMouseWheel", InjectBrowserMouseWheel );
+    CLuaCFunctions::AddFunction ( "getBrowserTitle", GetBrowserTitle );
+    CLuaCFunctions::AddFunction ( "getBrowserURL", GetBrowserURL );
+    CLuaCFunctions::AddFunction ( "setBrowserRenderingPaused", SetBrowserRenderingPaused );
+    CLuaCFunctions::AddFunction ( "executeBrowserJavascript", ExecuteBrowserJavascript );
+    CLuaCFunctions::AddFunction ( "getBrowserVolume", GetBrowserVolume );
+    CLuaCFunctions::AddFunction ( "setBrowserVolume", SetBrowserVolume );
+    CLuaCFunctions::AddFunction ( "isBrowserDomainBlocked", IsBrowserDomainBlocked );
+    CLuaCFunctions::AddFunction ( "focusBrowser", FocusBrowser );
+    CLuaCFunctions::AddFunction ( "isBrowserFocused", IsBrowserFocused );
+    CLuaCFunctions::AddFunction ( "setBrowserProperty", SetBrowserProperty );
+    CLuaCFunctions::AddFunction ( "getBrowserProperty", GetBrowserProperty );
+    CLuaCFunctions::AddFunction ( "getBrowserSettings", GetBrowserSettings );
+    CLuaCFunctions::AddFunction ( "getBrowserSource", GetBrowserSource );
+    CLuaCFunctions::AddFunction ( "setBrowserAjaxHandler", SetBrowserAjaxHandler );
+    CLuaCFunctions::AddFunction ( "canBrowserNavigateBack", CanBrowserNavigateBack );
+    CLuaCFunctions::AddFunction ( "canBrowserNavigateForward", CanBrowserNavigateForward );
+    CLuaCFunctions::AddFunction ( "navigateBrowserBack", NavigateBrowserBack );
+    CLuaCFunctions::AddFunction ( "navigateBrowserForward", NavigateBrowserForward );
+    CLuaCFunctions::AddFunction ( "reloadBrowserPage", ReloadBrowserPage );
+    CLuaCFunctions::AddFunction ( "toggleBrowserDevTools", ToggleBrowserDevTools );
+    CLuaCFunctions::AddFunction ( "guiCreateBrowser", GUICreateBrowser );
+    CLuaCFunctions::AddFunction ( "guiGetBrowser", GUIGetBrowser );
 }
 
 
@@ -122,12 +98,6 @@ void CLuaBrowserDefs::AddClass ( lua_State* luaVM )
 }
 
 
-bool CLuaBrowserDefs::IsBrowserSupported ()
-{
-    return g_pCore->GetWebCore() != nullptr;
-}
-
-
 int CLuaBrowserDefs::CreateBrowser ( lua_State* luaVM )
 {
     //  texture createBrowser ( int width, int height, bool isLocal [, bool transparent = false] )
@@ -990,4 +960,4 @@ int CLuaBrowserDefs::SetBrowserAjaxHandler ( lua_State* luaVM )
 
     lua_pushboolean ( luaVM, false );
     return 1;
-}
+}

MTA10/mods/shared_logic/luadefs/CLuaBrowserDefs.h

@@ -18,8 +18,6 @@ class CLuaBrowserDefs : public CLuaDefs
     static void LoadFunctions ( void );
     static void AddClass ( lua_State* luaVM );
 
-    static bool IsBrowserSupported ();
-
     LUA_DECLARE ( CreateBrowser );
     LUA_DECLARE ( RequestBrowserDomains );
     LUA_DECLARE ( LoadBrowserURL );
@@ -50,4 +48,4 @@ class CLuaBrowserDefs : public CLuaDefs
     LUA_DECLARE ( ToggleBrowserDevTools )
     LUA_DECLARE ( GUICreateBrowser );
     LUA_DECLARE ( GUIGetBrowser );
-};
+};