Merge remote-tracking branch 'origin/candidate-9.6.x'

Signed-off-by: Jake Smith <[email protected]> # Conflicts: # version.cmake
hpcc-systems · Mar 26, 2024 · f935330 · f935330
2 parents cdbdf96 + 71a0fe4
commit f935330
Show file tree

Hide file tree

Showing 279 changed files with 9 additions and 62,501 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,17 +34,10 @@ FIND_PATH(SCINTILLA_WIN32_DIR PlatWin.cxx HINTS ${VCPKG_ROOT_DIR}/share/scintill
 FIND_PATH(BUGTRAP_DIR BugTrap.h HINTS ${VCPKG_ROOT_DIR}/share/bugtrap/source/Client)
 FIND_PATH(BUGTRAP_ZLIB_DIR zlib.def HINTS ${VCPKG_ROOT_DIR}/share/bugtrap/source/zlib)
 
-FILE(GLOB CEF_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/*")
-FIND_PATH(CEF_ROOT_DIR
-    NAMES Release/libcef.lib
-    PATHS ${CEF_SEARCH_PATHS}
-)
-
 MESSAGE("includes")
 MESSAGE("  - boost:  ${Boost_INCLUDE_DIRS}")
 MESSAGE("  - wtl:  ${WTL_INCLUDE_DIR}")
 MESSAGE("  - Scintilla:  ${SCINTILLA_INCLUDE_DIR}")
-MESSAGE("  - CEF:  ${CEF_ROOT_DIR}")
 
 MESSAGE("sources")
 MESSAGE("  - Scintilla")

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -72,18 +72,21 @@
             "name": "VS-16-Debug",
             "configurePreset": "vcpkg-VS-16",
             "configuration": "Debug",
+            "jobs": 4,
             "nativeToolOptions": ["-m"]
         },
         {
             "name": "VS-17-Debug",
             "configurePreset": "vcpkg-VS-17",
             "configuration": "Debug",
+            "jobs": 4,
             "nativeToolOptions": ["-m"]
         },
         {
             "name": "VS-17-RelWithDebInfo",
             "configurePreset": "vcpkg-VS-17",
             "configuration": "RelWithDebInfo",
+            "jobs": 4,
             "nativeToolOptions": ["-m"]
         }
     ]

diff --git a/eclide/CMakeLists.txt b/eclide/CMakeLists.txt
@@ -118,7 +118,6 @@ INCLUDE_DIRECTORIES (
     ${WTL_INCLUDE_DIR}
     ${SCINTILLA_INCLUDE_DIR}
     ${BUGTRAP_DIR}
-    ${CEF_ROOT_DIR}
 )
 
 ADD_DEFINITIONS( -D_AFXDLL -D_USRDLL )

diff --git a/eclide/QueryBuilder.cpp b/eclide/QueryBuilder.cpp
@@ -15,21 +15,6 @@
 #include "aboutdlg.h"
 #include <EclCC.h>
 
-#include "include/cef_base.h"
-#include "include/cef_app.h" 
-
-class CefMfcCefApp : public CefApp, public CefBrowserProcessHandler {
-public:
-    CefMfcCefApp() {}
-
-    virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() OVERRIDE {
-        return this;
-    }
-
-private:
-    IMPLEMENT_REFCOUNTING(CefMfcCefApp);
-};
-
 class CConfigCache 
 {
 public:
@@ -74,14 +59,10 @@ BOOL CQueryBuilderApp::PumpMessage()
     auto result = CWinAppEx::PumpMessage();
 
     // If there are other messages on queue then return right away
-    // otherwise CEF has a habit of eating keystrokes not meant for it
     MSG msg;
     if (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
         return result;
 
-    // Allow Cef to do his thing
-    CefDoMessageLoopWork();
-
     return result;
 }
 
@@ -118,9 +99,6 @@ BOOL CQueryBuilderApp::InitInstance()
     InitCtrls.dwICC = ICC_WIN95_CLASSES;
     InitCommonControlsEx(&InitCtrls);
 
-    if (!InitializeCef())
-        return FALSE;
-
     CWinAppEx::InitInstance();
 
     // Initialize OLE libraries
@@ -233,8 +211,6 @@ int CQueryBuilderApp::ExitInstance()
     // Terminate ATL
     _Module.Term();
 
-    UninitializeCef();
-
     ResetIConfigs();
 
     int retVal = CWinAppEx::ExitInstance();
@@ -265,26 +241,4 @@ void CQueryBuilderApp::LoadCustomState()
 
 void CQueryBuilderApp::SaveCustomState()
 {
-}
-
-bool CQueryBuilderApp::InitializeCef()
-{
-    m_cefApp = new CefMfcCefApp();
-    CefMainArgs mainargs(m_hInstance);
-
-    const auto exit_code = CefExecuteProcess(mainargs, m_cefApp.get(), nullptr);
-    if (exit_code >= 0)
-        return false;
-
-    CefSettings settings;
-    settings.multi_threaded_message_loop = false;
-    settings.no_sandbox = true;
-    settings.ignore_certificate_errors = true;
-    return CefInitialize(mainargs, settings, m_cefApp.get(), nullptr);
-}
-
-void CQueryBuilderApp::UninitializeCef()
-{
-    CefShutdown();
-}
-
+}
diff --git a/eclide/QueryBuilder.h b/eclide/QueryBuilder.h
@@ -8,9 +8,6 @@
 
 #include "..\en_us\resource.h"       // main symbols
 
-#include "include/cef_base.h"
-#include "include/cef_app.h" 
-
 // CQueryBuilderApp:
 // See QueryBuilder.cpp for the implementation of this class
 //
@@ -42,13 +39,7 @@ class CQueryBuilderApp : public CWinAppEx
     virtual void SaveCustomState();
 
     afx_msg void OnAppAbout();
-    DECLARE_MESSAGE_MAP()
-
-private:
-    CefRefPtr<CefApp> m_cefApp;
-
-    bool InitializeCef();
-    void UninitializeCef();
+    DECLARE_MESSAGE_MAP();
 
 };
 

diff --git a/eclide/SummaryView.cpp b/eclide/SummaryView.cpp
@@ -9,14 +9,7 @@
 CSummaryView::CSummaryView(IResultSlot *resultSlot)
 {
     m_resultSlot = resultSlot;
-    m_browserEngine = GetIConfig(QUERYBUILDER_CFG)->Get(GLOBAL_BROWSER_ENGINE);
-    if (m_browserEngine.Compare(_T("IE")) == 0) {
-        m_view = CreateIEView();
-    } else if (m_browserEngine.Compare(_T("Chromium")) == 0) {
-        m_view = CreateChromiumView();
-    } else {
-        m_view = CreateWebView2View(); 
-    }
+    m_view = CreateWebView2View(); 
 }
 
 CSummaryView::~CSummaryView()
@@ -88,12 +81,6 @@ LRESULT CSummaryView::OnBrowserNew(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hW
     return 0;
 }
 
-LRESULT CSummaryView::OnBrowserIE(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-{
-    m_view->Navigate(m_FramedUrl, true);
-    return 0;
-}
-
 LRESULT CSummaryView::OnBrowserNewEclWatch(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
     int pos = m_FramedUrl.Find(_T("?"));
@@ -183,7 +170,6 @@ bool CSummaryView::UpdateUI(CCmdUI * cui)
     if ( m_view->IsLoaded() )
     {
         UPDATEUI(cui, ID_BROWSER_NEW, true);
-        UPDATEUI(cui, ID_BROWSER_IE, m_browserEngine.Compare(L"IE") == 0);
         UPDATEUI(cui, ID_BROWSER_NEW_ECLWATCH, true);
         UPDATEUI(cui, ID_BROWSER_RESET, true);
         UPDATEUI(cui, ID_BROWSER_BACK, m_view->BackEnabled());

diff --git a/eclide/SummaryView.h b/eclide/SummaryView.h
@@ -18,7 +18,6 @@ class CSummaryView :
     CString m_Url;
     CString m_FramedUrl;
     IHtmlView *m_view;
-    CString m_browserEngine;
 
 public:
     enum {IDD = IDD_SUMMARYVIEW};
@@ -40,7 +39,6 @@ class CSummaryView :
         MESSAGE_HANDLER(WM_FORWARDMSG, OnForwardMsg)
         MESSAGE_HANDLER_EX(CWM_REFRESH, OnRefresh)
         COMMAND_ID_HANDLER(ID_BROWSER_NEW, OnBrowserNew)
-        COMMAND_ID_HANDLER(ID_BROWSER_IE, OnBrowserIE)
         COMMAND_ID_HANDLER(ID_BROWSER_NEW_ECLWATCH, OnBrowserNewEclWatch)
         COMMAND_ID_HANDLER(ID_BROWSER_BACK, OnBrowserBack)
         COMMAND_ID_HANDLER(ID_BROWSER_FORWARD, OnBrowserForward)
@@ -60,7 +58,6 @@ class CSummaryView :
     void DoRefresh();
     LRESULT OnRefresh(UINT /*uMsg*/, WPARAM /*bCreated*/, LPARAM /*lParam*/);
     LRESULT OnBrowserNew(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-    LRESULT OnBrowserIE(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnBrowserNewEclWatch(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnBrowserBack(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnBrowserForward(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);

diff --git a/eclide/mainfrm.cpp b/eclide/mainfrm.cpp
@@ -1215,7 +1215,6 @@ void CMainFrame::InitializeRibbon()
         pPanelNavigation->Add(pButtLaunch);
         pButtLaunch->AddSubItem(new CMFCRibbonLabel(_T("Launch in external browser")));
         pButtLaunch->AddSubItem(new CMFCRibbonButton(ID_BROWSER_NEW, _T("Default browser\nD"), 44));
-        pButtLaunch->AddSubItem(new CMFCRibbonButton(ID_BROWSER_IE, _T("Internet Explorer\nI"), 44));
         pButtLaunch->AddSubItem(new CMFCRibbonSeparator(true));
         pButtLaunch->AddSubItem(new CMFCRibbonButton(ID_BROWSER_NEW_ECLWATCH, _T("ECL Watch homepage\nE"), 44));
         pPanelNavigation->Add(new CMFCRibbonSeparator());

diff --git a/en_us/CMakeLists.txt b/en_us/CMakeLists.txt
@@ -20,8 +20,6 @@ ADD_LIBRARY (EN_US SHARED
 ADD_CUSTOM_COMMAND(
     TARGET EN_US
     POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CEF_ROOT_DIR}/Release ${EXECUTABLE_OUTPUT_PATH}/$<CONFIG>
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CEF_ROOT_DIR}/Resources ${EXECUTABLE_OUTPUT_PATH}/$<CONFIG>
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/docs ${EXECUTABLE_OUTPUT_PATH}/$<CONFIG>
 )
 

diff --git a/en_us/en_us.rc b/en_us/en_us.rc
@@ -277,7 +277,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "Server &IP:",IDC_STATIC,10,8,49,8
     EDITTEXT        IDC_EDIT_IPADDRESS,48,7,159,14,ES_AUTOHSCROLL
-    CONTROL         "&SSL",IDC_CHECK_SSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,214,9,27,10
+    CONTROL         "&SSL",IDC_CHECK_SSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,214,9,23,10
     CONTROL         "A&dvanced",IDC_CHECK_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,239,9,47,10
     LTEXT           "Topolo&gy Server:",IDC_STATIC_TOPOLOGY,10,28,56,8
     EDITTEXT        IDC_EDIT_TOPOLOGYSERVER,71,25,208,14,ES_AUTOHSCROLL | WS_DISABLED
@@ -326,8 +326,6 @@ BEGIN
     LTEXT           "Limit Result (rows):",IDC_STATIC_LIMITRESULT,162,27,62,8
     EDITTEXT        IDC_EDIT_LIMITRESULT,228,24,40,14,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "",IDC_SPIN_LIMITRESULT,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,268,24,11,14
-    LTEXT           "&Browser Engine:",IDC_STATIC_BROWSERENGINE,10,45,117,10
-    COMBOBOX        IDC_COMBO_BROWSERENGINE,71,42,208,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_PREF_OTHER DIALOGEX 0, 0, 290, 157

diff --git a/en_us/resource.h b/en_us/resource.h
@@ -550,7 +550,6 @@
 #define IDC_BUTTON_MATCH                549
 #define IDC_EDIT_ECLWATCH               550
 #define IDC_STATIC_BROWSERENGINE        551
-#define IDC_COMBO_BROWSERENGINE         552
 #define ID_COL_PANE                     32772
 #define ID_WINDOW_MANAGER               32773
 #define ID_ROW_PANE                     32774
@@ -760,7 +759,6 @@
 #define ID_ADVANCED_SETTABSIZE          33019
 #define ID_WORKUNIT_OPENGRAPH           33020
 #define ID_WORKUNIT_VIEWEXCEPTIONS      33021
-#define ID_BROWSER_IE                   33022
 #define ID_APPLY                        33023
 #define ID_SORTING_DEGROUP              33024
 #define ID_FILE_NEWWORKSPACE            33025
@@ -879,7 +877,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        61415
 #define _APS_NEXT_COMMAND_VALUE         33135
-#define _APS_NEXT_CONTROL_VALUE         553
+#define _APS_NEXT_CONTROL_VALUE         552
 #define _APS_NEXT_SYMED_VALUE           61503
 #endif
 #endif
diff --git a/third_party/cef/Debug/lib/libcef_dll_wrapper.lib b/third_party/cef/Debug/lib/libcef_dll_wrapper.lib
diff --git a/third_party/cef/Debug/libcef.lib b/third_party/cef/Debug/libcef.lib
diff --git a/third_party/cef/Release/chrome_elf.dll b/third_party/cef/Release/chrome_elf.dll
diff --git a/third_party/cef/Release/d3dcompiler_47.dll b/third_party/cef/Release/d3dcompiler_47.dll
diff --git a/third_party/cef/Release/libEGL.dll b/third_party/cef/Release/libEGL.dll
diff --git a/third_party/cef/Release/libGLESv2.dll b/third_party/cef/Release/libGLESv2.dll
diff --git a/third_party/cef/Release/libcef.dll b/third_party/cef/Release/libcef.dll
diff --git a/third_party/cef/Release/libcef.lib b/third_party/cef/Release/libcef.lib
diff --git a/third_party/cef/Release/natives_blob.bin b/third_party/cef/Release/natives_blob.bin
diff --git a/third_party/cef/Release/snapshot_blob.bin b/third_party/cef/Release/snapshot_blob.bin
diff --git a/third_party/cef/Release/swiftshader/libEGL.dll b/third_party/cef/Release/swiftshader/libEGL.dll
diff --git a/third_party/cef/Release/swiftshader/libGLESv2.dll b/third_party/cef/Release/swiftshader/libGLESv2.dll
diff --git a/third_party/cef/Release/v8_context_snapshot.bin b/third_party/cef/Release/v8_context_snapshot.bin
diff --git a/third_party/cef/Resources/cef.pak b/third_party/cef/Resources/cef.pak
diff --git a/third_party/cef/Resources/cef_100_percent.pak b/third_party/cef/Resources/cef_100_percent.pak
diff --git a/third_party/cef/Resources/cef_200_percent.pak b/third_party/cef/Resources/cef_200_percent.pak
diff --git a/third_party/cef/Resources/cef_extensions.pak b/third_party/cef/Resources/cef_extensions.pak
diff --git a/third_party/cef/Resources/devtools_resources.pak b/third_party/cef/Resources/devtools_resources.pak
diff --git a/third_party/cef/Resources/icudtl.dat b/third_party/cef/Resources/icudtl.dat
diff --git a/third_party/cef/Resources/locales/en-US.pak b/third_party/cef/Resources/locales/en-US.pak