diff --git a/CMakeLists.txt b/CMakeLists.txt index f3d7d6599eb..befe16970ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,6 @@ include(FetchContent) if(MINGW) include(cmake/mingw.cmake) include(cmake/reactos-atl.cmake) - include(cmake/widl.cmake) endif() # Find/Add build dependencies and stubs shared by all projects diff --git a/Core/.gitignore b/Core/.gitignore index ca4c11d9bb7..db5ad1c333e 100644 --- a/Core/.gitignore +++ b/Core/.gitignore @@ -1,7 +1,4 @@ # Generated files -BrowserDispatch_i.c -BrowserDispatch.h -BrowserDispatch.tlb generatedVersion.h # Generated shader headers diff --git a/Core/GameEngine/CMakeLists.txt b/Core/GameEngine/CMakeLists.txt index 6ae2817f4f7..4b409ed0d03 100644 --- a/Core/GameEngine/CMakeLists.txt +++ b/Core/GameEngine/CMakeLists.txt @@ -567,8 +567,6 @@ set(GAMEENGINE_SRC Include/GameNetwork/Transport.h Include/GameNetwork/udp.h Include/GameNetwork/User.h - Include/GameNetwork/WOLBrowser/FEBDispatch.h - Include/GameNetwork/WOLBrowser/WebBrowser.h Include/Precompiled/PreRTS.h Source/Common/AddonCompat.cpp Source/Common/Audio/AudioEventRTS.cpp @@ -623,7 +621,6 @@ set(GAMEENGINE_SRC Source/Common/INI/INIVideo.cpp Source/Common/INI/INIWater.cpp Source/Common/INI/INIWeapon.cpp - Source/Common/INI/INIWebpageURL.cpp Source/Common/Language.cpp Source/Common/MessageStream.cpp Source/Common/MiniLog.cpp @@ -1174,7 +1171,6 @@ set(GAMEENGINE_SRC Source/GameNetwork/Transport.cpp Source/GameNetwork/udp.cpp Source/GameNetwork/User.cpp - Source/GameNetwork/WOLBrowser/WebBrowser.cpp Source/Precompiled/PreRTS.cpp ) @@ -1206,7 +1202,6 @@ target_include_directories(corei_gameengine_public INTERFACE target_link_libraries(corei_gameengine_public INTERFACE core_compression - core_browserdispatch core_minidumper #core_wwvegas d3d8lib diff --git a/Core/GameEngine/Include/Common/INI.h b/Core/GameEngine/Include/Common/INI.h index 88288f97487..30fe0a45abf 100644 --- a/Core/GameEngine/Include/Common/INI.h +++ b/Core/GameEngine/Include/Common/INI.h @@ -211,7 +211,6 @@ class INI static void parseAudioEventDefinition( INI *ini ); static void parseDialogDefinition( INI *ini ); static void parseMusicTrackDefinition( INI *ini ); - static void parseWebpageURLDefinition( INI *ini ); static void parseHeaderTemplateDefinition( INI *ini ); static void parseParticleSystemDefinition( INI *ini ); static void parseWaterSettingDefinition( INI *ini ); diff --git a/Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h deleted file mode 100644 index e7e0eb1135e..00000000000 --- a/Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -// -// FEBDispatch class is a template class which, when inherited from, can implement the -// IDispatch for a COM object with a type library. -// - -#pragma once - -#if defined __MINGW32__ -#include "Utility/atl_compat.h" -#include "Utility/comsupp_compat.h" -#endif - -#include -extern CComModule _Module; -#include -#include // For _bstr_t. - -#include "oleauto.h" - -template -class FEBDispatch : -public CComObjectRootEx, -public CComCoClass, -public C -{ -public: - - BEGIN_COM_MAP(T) - COM_INTERFACE_ENTRY(C) - COM_INTERFACE_ENTRY_AGGREGATE(IID_IDispatch, m_dispatch) - END_COM_MAP() - - FEBDispatch() - { - m_ptinfo = nullptr; - m_dispatch = nullptr; - - ITypeLib *ptlib; - HRESULT hr; - HRESULT TypeLibraryLoadResult; - char filename[256]; - - GetModuleFileName(nullptr, filename, sizeof(filename)); - _bstr_t bstr(filename); - - TypeLibraryLoadResult = LoadTypeLib(bstr, &ptlib); - - DEBUG_ASSERTCRASH(TypeLibraryLoadResult == 0, ("Can't load type library for Embedded Browser")); - - if (TypeLibraryLoadResult == S_OK) - { - hr = ptlib->GetTypeInfoOfGuid(*I, &m_ptinfo); - ptlib->Release(); - - if (hr == S_OK) - { - hr = CreateStdDispatch(static_cast(this), static_cast(this), m_ptinfo, &m_dispatch); - - m_dispatch->AddRef(); - // Don't release the IUnknown from CreateStdDispatch without calling AddRef. - // It looks like CreateStdDispatch doesn't call AddRef on the IUnknown it returns. - } - } - - if ( m_dispatch == nullptr ) - { - DEBUG_LOG(("Error creating Dispatch for Web interface")); - } - } - - virtual ~FEBDispatch() - { - if (m_ptinfo) - m_ptinfo->Release(); - - if (m_dispatch) - m_dispatch->Release(); - } - - IUnknown *m_dispatch; - -private: - ITypeInfo *m_ptinfo; -}; diff --git a/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h deleted file mode 100644 index 83bf5dc85ee..00000000000 --- a/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -/****************************************************************************** -* -* NAME -* $Archive: $ -* -* DESCRIPTION -* Web Browser -* -* PROGRAMMER -* Bryan Cleveland -* $Author: $ -* -* VERSION INFO -* $Revision: $ -* $Modtime: $ -* -******************************************************************************/ - -#pragma once - -#include "Common/SubsystemInterface.h" -#include -#include -#include -#include "EABrowserDispatch/BrowserDispatch.h" -#include "FEBDispatch.h" - -class GameWindow; - -class WebBrowserURL : public MemoryPoolObject -{ - MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WebBrowserURL, "WebBrowserURL" ) - -public: - - WebBrowserURL(); - // virtual destructor prototype defined by memory pool object - - const FieldParse *getFieldParse() const { return m_URLFieldParseTable; } - - AsciiString m_tag; - AsciiString m_url; - - WebBrowserURL *m_next; - - static const FieldParse m_URLFieldParseTable[]; ///< the parse table for INI definition - -}; - - - -class WebBrowser : - public FEBDispatch, - public SubsystemInterface - { - public: - virtual void init() override; - virtual void reset() override; - virtual void update() override; - - // Create an instance of the embedded browser for Dune Emperor. - virtual Bool createBrowserWindow(const char *tag, GameWindow *win) = 0; - virtual void closeBrowserWindow(GameWindow *win) = 0; - - WebBrowserURL *makeNewURL(AsciiString tag); - WebBrowserURL *findURL(AsciiString tag); - - protected: - // Protected to prevent direct construction via new, use CreateInstance() instead. - WebBrowser(); - virtual ~WebBrowser() override; - - // Protected to prevent copy and assignment - WebBrowser(const WebBrowser&); - const WebBrowser& operator=(const WebBrowser&); - -// Bool RetrievePageURL(const char* page, char* url, int size); -// Bool RetrieveHTMLPath(char* path, int size); - - protected: - ULONG mRefCount; - WebBrowserURL *m_urlList; - - //--------------------------------------------------------------------------- - // IUnknown methods - //--------------------------------------------------------------------------- - protected: - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT override; - ULONG STDMETHODCALLTYPE AddRef() IUNKNOWN_NOEXCEPT override; - ULONG STDMETHODCALLTYPE Release() IUNKNOWN_NOEXCEPT override; - - //--------------------------------------------------------------------------- - // IBrowserDispatch methods - //--------------------------------------------------------------------------- - public: - STDMETHOD(TestMethod)(Int num1); - }; - -extern CComObject *TheWebBrowser; diff --git a/Core/GameEngine/Source/Common/INI/INI.cpp b/Core/GameEngine/Source/Common/INI/INI.cpp index a6a81086724..44f84a9f6cb 100644 --- a/Core/GameEngine/Source/Common/INI/INI.cpp +++ b/Core/GameEngine/Source/Common/INI/INI.cpp @@ -150,7 +150,6 @@ static const BlockParse theTypeTable[] = { "WaterTransparency", INI::parseWaterTransparencyDefinition }, { "Weapon", INI::parseWeaponTemplateDefinition }, { "Weather", INI::parseWeatherDefinition }, - { "WebpageURL", INI::parseWebpageURLDefinition }, { "WindowTransition", INI::parseWindowTransitions }, }; diff --git a/Core/GameEngine/Source/Common/INI/INIWebpageURL.cpp b/Core/GameEngine/Source/Common/INI/INIWebpageURL.cpp deleted file mode 100644 index 17908288d94..00000000000 --- a/Core/GameEngine/Source/Common/INI/INIWebpageURL.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -// FILE: INIWebpageURL.cpp ///////////////////////////////////////////////////////////////////////////// -// Author: Bryan Cleveland, November 2001 -// Desc: Parsing Webpage URL INI entries -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// INCLUDES /////////////////////////////////////////////////////////////////////////////////////// -#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine - -#include "Common/INI.h" -#include "Common/Registry.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// PUBLIC FUNCTIONS /////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////////////////////////// - -AsciiString encodeURL(AsciiString source) -{ - if (source.isEmpty()) - { - return AsciiString::TheEmptyString; - } - - AsciiString target; - AsciiString allowedChars = "$-_.+!*'(),\\"; - const char *ptr = source.str(); - while (*ptr) - { - if (isalnum(*ptr) || allowedChars.find(*ptr)) - { - target.concat(*ptr); - } - else - { - AsciiString tmp; - target.concat('%'); - tmp.format("%2.2x", ((int)*ptr)); - target.concat(tmp); - } - ++ptr; - } - - return target; -} - -//------------------------------------------------------------------------------------------------- -/** Parse Music entry */ -//------------------------------------------------------------------------------------------------- -void INI::parseWebpageURLDefinition( INI* ini ) -{ - AsciiString tag; - WebBrowserURL *url; - - // read the name - const char* c = ini->getNextToken(); - tag.set( c ); - - if (TheWebBrowser != nullptr) - { - url = TheWebBrowser->findURL(tag); - - if (url == nullptr) - { - url = TheWebBrowser->makeNewURL(tag); - } - } - - // find existing item if present -// track = TheAudio->Music->getTrack( name ); -// if( track == nullptr ) -// { - - // allocate a new track -// track = TheAudio->Music->newMusicTrack( name ); - -// } // end if - -// DEBUG_ASSERTCRASH( track, ("parseMusicTrackDefinition: Unable to allocate track '%s'", -// name.str()) ); - - // parse the ini definition - ini->initFromINI( url, url->getFieldParse() ); - - if (url->m_url.startsWith("file://")) - { - char cwd[_MAX_PATH] = "\\"; - getcwd(cwd, _MAX_PATH); - - url->m_url.format("file://%s\\Data\\%s\\%s", encodeURL(cwd).str(), GetRegistryLanguage().str(), url->m_url.str()+7); - DEBUG_LOG(("INI::parseWebpageURLDefinition() - converted URL to [%s]", url->m_url.str())); - } -} - - diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl index 594b1bf004c..72cb299167b 100644 --- a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl +++ b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl @@ -47,7 +47,6 @@ static PoolSizeRec PoolSizes[] = { "CommandButton", 300, 16 }, { "CommandSet", 256, 16 }, { "DisplayString", 32, 32 }, - { "WebBrowserURL", 16, 16 }, { "Drawable", 4096, 32 }, { "Image", 2048, 32 }, { "ParticlePool", 4096, 256 }, diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl index c7c912f0cbc..c8977c0f9fd 100644 --- a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl +++ b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl @@ -47,7 +47,6 @@ static PoolSizeRec PoolSizes[] = { "CommandButton", 1024, 256 }, { "CommandSet", 820, 16 }, { "DisplayString", 32, 32 }, - { "WebBrowserURL", 16, 16 }, { "Drawable", 4096, 32 }, { "Image", 2048, 32 }, { "ParticlePool", 1400, 1024 }, diff --git a/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp deleted file mode 100644 index 11198b19887..00000000000 --- a/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp +++ /dev/null @@ -1,310 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -/****************************************************************************** -* -* NAME -* $Archive: $ -* -* DESCRIPTION -* -* PROGRAMMER -* Bryan Cleveland -* $Author: $ -* -* VERSION INFO -* $Revision: $ -* $Modtime: $ -* -******************************************************************************/ - -#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine - -//#include "WinMain.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" -#include "GameClient/GameWindow.h" -#include "GameClient/Display.h" - - -/** - * OLEInitializer class - Init and shutdown OLE & COM as a global - * object. Scary, nasty stuff, COM. /me shivers. - */ -class OLEInitializer -{ -public: - OLEInitializer() - { - // Initialize this instance - OleInitialize(nullptr); - } - ~OLEInitializer() - { - OleUninitialize(); - } -}; -OLEInitializer g_OLEInitializer; -CComModule _Module; - -CComObject * TheWebBrowser = nullptr; - - -/****************************************************************************** -* -* NAME -* WebBrowser::WebBrowser -* -* DESCRIPTION -* Default constructor -* -* INPUTS -* NONE -* -* RESULT -* NONE -* -******************************************************************************/ - -WebBrowser::WebBrowser() : - mRefCount(1) -{ - DEBUG_LOG(("Instantiating embedded WebBrowser")); - m_urlList = nullptr; -} - - -/****************************************************************************** -* -* NAME -* WebBrowser::~WebBrowser -* -* DESCRIPTION -* Destructor -* -* INPUTS -* NONE -* -* RESULT -* NONE -* -******************************************************************************/ - -WebBrowser::~WebBrowser() -{ - DEBUG_LOG(("Destructing embedded WebBrowser")); - if (this == TheWebBrowser) { - DEBUG_LOG(("WebBrowser::~WebBrowser - setting TheWebBrowser to null")); - TheWebBrowser = nullptr; - } - WebBrowserURL *url = m_urlList; - while (url != nullptr) { - WebBrowserURL *temp = url; - url = url->m_next; - deleteInstance(temp); - temp = nullptr; - } -} - -//------------------------------------------------------------------------------------------------- -/** The INI data fields for Webpage URL's */ -//------------------------------------------------------------------------------------------------- -const FieldParse WebBrowserURL::m_URLFieldParseTable[] = -{ - - { "URL", INI::parseAsciiString, nullptr, offsetof( WebBrowserURL, m_url ) }, - { nullptr, nullptr, nullptr, 0 }, - -}; - -WebBrowserURL::WebBrowserURL() -{ - m_next = nullptr; - m_tag.clear(); - m_url.clear(); -} - -WebBrowserURL::~WebBrowserURL() -{ -} -/****************************************************************************** -* -* NAME -* WebBrowser::init -* -* DESCRIPTION -* Perform post creation initialization. -* -* INPUTS -* NONE -* -* RESULT -* NONE -* -******************************************************************************/ - -void WebBrowser::init() -{ - m_urlList = nullptr; - INI ini; - ini.loadFileDirectory( "Data\\INI\\Webpages", INI_LOAD_OVERWRITE, nullptr ); -} - -/****************************************************************************** -* -* NAME -* WebBrowser::reset -* -* DESCRIPTION -* Perform post creation initialization. -* -* INPUTS -* NONE -* -* RESULT -* NONE -* -******************************************************************************/ - -void WebBrowser::reset() -{ -} - -void WebBrowser::update() -{ -} - -WebBrowserURL * WebBrowser::findURL(AsciiString tag) -{ - WebBrowserURL *retval = m_urlList; - - while ((retval != nullptr) && tag.compareNoCase(retval->m_tag.str())) - { - retval = retval->m_next; - } - - return retval; -} - -WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag) -{ - WebBrowserURL *newURL = newInstance(WebBrowserURL); - - newURL->m_tag = tag; - - newURL->m_next = m_urlList; - m_urlList = newURL; - - return newURL; -} - -/****************************************************************************** -* -* NAME -* IUnknown::QueryInterface -* -* DESCRIPTION -* -* INPUTS -* IID - Interface ID -* -* RESULT -* -******************************************************************************/ - -STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEPT -{ - *ppv = nullptr; - - if ((iid == IID_IUnknown) || (iid == IID_IBrowserDispatch)) - { - *ppv = static_cast(this); - } - else - { - return E_NOINTERFACE; - } - - static_cast(*ppv)->AddRef(); - - return S_OK; -} - - -/****************************************************************************** -* -* NAME -* IUnknown::AddRef -* -* DESCRIPTION -* -* INPUTS -* NONE -* -* RESULT -* -******************************************************************************/ - -ULONG STDMETHODCALLTYPE WebBrowser::AddRef() IUNKNOWN_NOEXCEPT -{ - return ++mRefCount; -} - - -/****************************************************************************** -* -* NAME -* IUnknown::Release -* -* DESCRIPTION -* -* INPUTS -* NONE -* -* RESULT -* -******************************************************************************/ - -ULONG STDMETHODCALLTYPE WebBrowser::Release() IUNKNOWN_NOEXCEPT -{ - DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count")); - --mRefCount; - - if (mRefCount == 0) - { - DEBUG_LOG(("WebBrowser::Release - all references released, deleting the object.")); - if (this == TheWebBrowser) { - TheWebBrowser = nullptr; - } - delete this; - return 0; - } - - return mRefCount; -} - -STDMETHODIMP WebBrowser::TestMethod(Int num1) -{ - DEBUG_LOG(("WebBrowser::TestMethod - num1 = %d", num1)); - return S_OK; -} diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt index d3c3a82c812..542f031f415 100644 --- a/Core/GameEngineDevice/CMakeLists.txt +++ b/Core/GameEngineDevice/CMakeLists.txt @@ -78,7 +78,6 @@ set(GAMEENGINEDEVICE_SRC Include/W3DDevice/GameClient/W3DWater.h Include/W3DDevice/GameClient/W3DWaterTracks.h # Include/W3DDevice/GameClient/W3DWaypointBuffer.h -# Include/W3DDevice/GameClient/W3DWebBrowser.h Include/W3DDevice/GameClient/WorldHeightMap.h # Include/W3DDevice/GameLogic/W3DGameLogic.h # Include/W3DDevice/GameLogic/W3DGhostObject.h @@ -176,7 +175,6 @@ set(GAMEENGINEDEVICE_SRC Source/W3DDevice/GameClient/W3DScreenshot.cpp Source/W3DDevice/GameClient/stb_image_write_impl.cpp # Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp -# Source/W3DDevice/GameClient/W3DWebBrowser.cpp Source/W3DDevice/GameClient/Water/W3DWater.cpp Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp Source/W3DDevice/GameClient/WorldHeightMap.cpp diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h index 040a7fc445e..77dacbbbc96 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h @@ -42,7 +42,6 @@ #include "W3DDevice/Common/W3DModuleFactory.h" #include "W3DDevice/GameLogic/W3DGameLogic.h" #include "W3DDevice/GameClient/W3DGameClient.h" -#include "W3DDevice/GameClient/W3DWebBrowser.h" #include "W3DDevice/Common/W3DFunctionLexicon.h" #include "W3DDevice/Common/W3DRadar.h" #include "W3DDevice/Common/W3DThingFactory.h" @@ -79,7 +78,6 @@ class Win32GameEngine : public GameEngine virtual ArchiveFileSystem *createArchiveFileSystem() override; ///< factory for archive file system virtual NetworkInterface *createNetwork(); ///< Factory for the network virtual Radar *createRadar(Bool dummy) override; ///< Factory for radar - virtual WebBrowser *createWebBrowser() override; ///< Factory for embedded browser virtual AudioManager *createAudioManager(Bool dummy) override; ///< Factory for audio device virtual ParticleSystemManager* createParticleSystemManager(Bool dummy) override; @@ -110,7 +108,6 @@ inline Radar *Win32GameEngine::createRadar(Bool dummy) return NEW RadarDummy; return NEW W3DRadar; } -inline WebBrowser *Win32GameEngine::createWebBrowser() { return NEW CComObject; } inline AudioManager *Win32GameEngine::createAudioManager(Bool dummy) { if (dummy) diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index ab61f88fe0c..4d1a537cb03 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -98,7 +98,6 @@ static void drawFramerateBar(); #include "WW3D2/render2dsentence.h" #include "WW3D2/sortingrenderer.h" #include "WW3D2/textureloader.h" -#include "WW3D2/dx8webbrowser.h" #include "WW3D2/mesh.h" #include "WW3D2/hlod.h" #include "WW3D2/meshmatdesc.h" @@ -488,8 +487,6 @@ W3DDisplay::~W3DDisplay() if (!TheGlobalData->m_headless) WW3D::Shutdown(); WWMath::Shutdown(); - if (!TheGlobalData->m_headless) - DX8WebBrowser::Shutdown(); delete TheW3DFileSystem; TheW3DFileSystem = nullptr; @@ -983,8 +980,6 @@ void W3DDisplay::init() m_nativeDebugDisplay->setFontHeight( 13 ); m_nativeDebugDisplay->setFontWidth( 9 ); } - - DX8WebBrowser::Initialize(); } // we're now online diff --git a/Core/Libraries/CMakeLists.txt b/Core/Libraries/CMakeLists.txt index a6e4c3483db..9459d2ea71b 100644 --- a/Core/Libraries/CMakeLists.txt +++ b/Core/Libraries/CMakeLists.txt @@ -13,6 +13,4 @@ add_subdirectory(Source/debug) # crash dump library add_subdirectory(Source/MiniDumper) -add_subdirectory(Source/EABrowserDispatch) -add_subdirectory(Source/EABrowserEngine) add_subdirectory(Source/Compression) diff --git a/Core/Libraries/Source/EABrowserDispatch/BrowserDispatch.idl b/Core/Libraries/Source/EABrowserDispatch/BrowserDispatch.idl deleted file mode 100644 index 73f9d29efae..00000000000 --- a/Core/Libraries/Source/EABrowserDispatch/BrowserDispatch.idl +++ /dev/null @@ -1,30 +0,0 @@ -// BrowserDispatch.idl : IDL source for BrowserDispatch.dll -// - -// This file will be processed by the MIDL tool to -// produce the type library (BrowserDispatch.tlb) and marshalling code. - -import "oaidl.idl"; -import "ocidl.idl"; -[ - uuid(C92D8250-A628-4CE5-823F-1A1F116EFCC9), - version(1.0), - helpstring("BrowserDispatch 1.0 Type Library") -] -library BROWSERDISPATCHLib -{ - importlib("stdole32.tlb"); - importlib("stdole2.tlb"); - - [ - object, - uuid(BC834510-C5BC-4B90-8C9A-0E4B1998796F), - dual, - helpstring("IBrowserDispatch Interface"), - pointer_default(unique) - ] - interface IBrowserDispatch : IUnknown - { - [id(1), helpstring("method TestMethod")] HRESULT TestMethod(int num1); - }; -}; diff --git a/Core/Libraries/Source/EABrowserDispatch/CMakeLists.txt b/Core/Libraries/Source/EABrowserDispatch/CMakeLists.txt deleted file mode 100644 index 2d5e42410d1..00000000000 --- a/Core/Libraries/Source/EABrowserDispatch/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -add_library(core_browserdispatch INTERFACE) - -if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows") - if(MINGW AND IDL_COMPILER_FOUND) - # Use widl for MinGW builds - add_idl_file(browserdispatch_idl "${CMAKE_CURRENT_LIST_DIR}/BrowserDispatch.idl") - add_library(core_browserdispatchwin STATIC ${browserdispatch_idl_IID} ${browserdispatch_idl_HEADER}) - elseif(MSVC) - # Use midl for MSVC builds - add_custom_command( - OUTPUT BrowserDispatch_i.c BrowserDispatch.h - COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserDispatch.idl" /header BrowserDispatch.h /iid BrowserDispatch_i.c - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS "${CMAKE_CURRENT_LIST_DIR}/BrowserDispatch.idl" - VERBATIM - ) - add_library(core_browserdispatchwin STATIC BrowserDispatch_i.c) - else() - message(FATAL_ERROR - "EABrowserDispatch requires an IDL compiler for Windows builds:\n" - " - For MinGW: Install widl (apt-get install wine-stable-dev)\n" - " - For MSVC: midl.exe should be in PATH\n" - " - For other compilers: Not currently supported") - endif() - - if(TARGET core_browserdispatchwin) - set_target_properties(core_browserdispatchwin PROPERTIES OUTPUT_NAME browserdispatchwin) - target_link_libraries(core_browserdispatch INTERFACE core_browserdispatchwin) - endif() -endif() - -target_include_directories(core_browserdispatch INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/..) diff --git a/Core/Libraries/Source/EABrowserEngine/BrowserEngine.idl b/Core/Libraries/Source/EABrowserEngine/BrowserEngine.idl deleted file mode 100644 index 46797b606c2..00000000000 --- a/Core/Libraries/Source/EABrowserEngine/BrowserEngine.idl +++ /dev/null @@ -1,153 +0,0 @@ -// Generated .IDL file (by the OLE/COM Object Viewer) -// -// typelib filename: - -// NOTE: Import of oaidl.idl has been added to fix compilation error with widl: -// BrowserEngine.idl:31:44: error: type 'IDispatch' not found in global namespace -import "oaidl.idl"; -[ - uuid(6EE45698-21BA-420D-AD40-1B547699BEFB), - version(1.0) -] -library BROWSERENGINELib -{ - // TLib : // TLib : OLE Automation : {00020430-0000-0000-C000-000000000046} - importlib("stdole2.tlb"); - - // Forward declare all types defined in this typelib - interface IFEBrowserEngine2; - interface IFEBrowserInstance2; - - [ - uuid(2B2CC8B0-2DC0-48C6-B6FD-C07820A6477E) - ] - coclass FEBrowserEngine2 { - [default] interface IFEBrowserEngine2; - }; - - [ - odl, - uuid(EE883B17-0778-4B18-A12B-E44C0D298412), - dual, - oleautomation - ] - interface IFEBrowserEngine2 : IDispatch { - [id(0x60020000)] - HRESULT Initialize(long* d3d_device); - [id(0x60020001)] - HRESULT Shutdown(); - [id(0x60020002)] - HRESULT CreateBrowser( - BSTR browsername, - BSTR url, - long parentwindow, - int x, - int y, - int w, - int h, - long option_bitmask, - IDispatch* gameinterface); - [id(0x60020003)] - HRESULT DestroyBrowser(BSTR browsername); - [id(0x60020004)] - HRESULT Navigate( - BSTR browsername, - BSTR url); - [id(0x60020005)] - HRESULT GetHWND( - BSTR browsername, - [out, retval] long* hwnd); - [id(0x60020006)] - HRESULT IsOpen( - BSTR browsername, - [out, retval] long* IsOpen); - [id(0x60020007)] - HRESULT D3DRender(int backbufferindex); - [id(0x60020008)] - HRESULT D3DUpdate(); - [id(0x60020009)] - HRESULT GetUpdateRate( - [in] BSTR browsername, - [out, retval] long* pVal); - [id(0x6002000a)] - HRESULT SetUpdateRate( - [in] BSTR browsername, - [in] long pVal); - [id(0x6002000b), propget] - HRESULT BadPageURL([out, retval] BSTR* pRate); - [id(0x6002000b), propput] - HRESULT BadPageURL([in] BSTR pRate); - [id(0x6002000d), propget] - HRESULT LoadingPageURL([out, retval] BSTR* pRate); - [id(0x6002000d), propput] - HRESULT LoadingPageURL([in] BSTR pRate); - [id(0x6002000f), propget] - HRESULT MouseFileName([out, retval] BSTR* pRate); - [id(0x6002000f), propput] - HRESULT MouseFileName([in] BSTR pRate); - [id(0x60020011), propget] - HRESULT MouseBusyFileName([out, retval] BSTR* pRate); - [id(0x60020011), propput] - HRESULT MouseBusyFileName([in] BSTR pRate); - }; - - [ - uuid(812A58AA-39E8-476E-BEED-00D79B76940B) - ] - coclass FEBrowserInstance2 { - [default] interface IFEBrowserInstance2; - }; - - [ - odl, - uuid(A6759E9F-2CA1-4A04-AF23-1658673E30B5), - dual, - oleautomation - ] - interface IFEBrowserInstance2 : IDispatch { - [id(0x60020000)] - HRESULT Navigate(BSTR url); - [id(0x60020001)] - HRESULT RequestURL( - [in] VARIANT requesttype, - [in] BSTR url, - [in] BSTR formdata, - [in] BSTR extradata, - [in] VARIANT callback, - [out, retval] VARIANT* result); - [id(0x60020002)] - HRESULT CloseBrowser(); - [id(0x60020003), propget] - HRESULT EngineVersion([out, retval] VARIANT* pVal); - [id(0x60020004), propget] - HRESULT gameinterface([out, retval] IDispatch** pVal); - [id(0x60020005), propget] - HRESULT CommandLineArgs([out, retval] VARIANT* pVal); - [id(0x60020006), propget] - HRESULT IsReleaseBuild([out, retval] long* pVal); - [id(0x60020007), propget] - HRESULT InstallFolder([out, retval] BSTR* pVal); - [id(0x60020008), propget] - HRESULT hwnd([out, retval] long* pHwnd); - [id(0x60020009), propget] - HRESULT UpdateRate([out, retval] long* pRate); - [id(0x60020009), propput] - HRESULT UpdateRate([in] long pRate); - [id(0x6002000b), propget] - HRESULT Name([out, retval] BSTR* pVal); - [id(0x6002000c), propget] - HRESULT SysInfo_OS([out, retval] BSTR* pVal); - [id(0x6002000d), propget] - HRESULT SysInfo_RAM([out, retval] long* pVal); - [id(0x6002000e), propget] - HRESULT SysInfo_CPUType([out, retval] BSTR* pVal); - [id(0x6002000f), propget] - HRESULT SysInfo_CPUSpeed([out, retval] long* pVal); - [id(0x60020010), propget] - HRESULT SysInfo_XRes([out, retval] long* pVal); - [id(0x60020011), propget] - HRESULT SysInfo_YRes([out, retval] long* pVal); - [id(0x60020012), propget] - HRESULT SysInfo_VideoAdapter([out, retval] BSTR* pVal); - }; -}; diff --git a/Core/Libraries/Source/EABrowserEngine/CMakeLists.txt b/Core/Libraries/Source/EABrowserEngine/CMakeLists.txt deleted file mode 100644 index e4ee1517d85..00000000000 --- a/Core/Libraries/Source/EABrowserEngine/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -add_library(core_browserengine INTERFACE) - -if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows") - if(MINGW AND IDL_COMPILER_FOUND) - # Use widl for MinGW builds - add_idl_file(browserengine_idl "${CMAKE_CURRENT_LIST_DIR}/BrowserEngine.idl") - add_library(core_browserenginewin STATIC ${browserengine_idl_IID} ${browserengine_idl_HEADER}) - elseif(MSVC) - # Use midl for MSVC builds - add_custom_command( - OUTPUT BrowserEngine_i.c BrowserEngine.h BrowserEngine.tlb - COMMAND midl.exe "${CMAKE_CURRENT_LIST_DIR}\\BrowserEngine.idl" /header BrowserEngine.h /iid BrowserEngine_i.c /tlb BrowserEngine.tlb - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS "${CMAKE_CURRENT_LIST_DIR}/BrowserEngine.idl" - VERBATIM - ) - add_library(core_browserenginewin STATIC BrowserEngine_i.c BrowserEngine.h BrowserEngine.tlb) - else() - message(FATAL_ERROR - "EABrowserEngine requires an IDL compiler for Windows builds:\n" - " - For MinGW: Install widl (apt-get install wine-stable-dev)\n" - " - For MSVC: midl.exe should be in PATH\n" - " - For other compilers: Not currently supported") - endif() - - if(TARGET core_browserenginewin) - set_target_properties(core_browserenginewin PROPERTIES OUTPUT_NAME browserenginewin) - target_link_libraries(core_browserengine INTERFACE core_browserenginewin) - endif() -endif() - -target_include_directories(core_browserengine INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/..) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index cdd352f6165..750e429feb3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -62,8 +62,6 @@ set(WW3D2_SRC dx8texman.h dx8vertexbuffer.cpp dx8vertexbuffer.h - dx8webbrowser.cpp - dx8webbrowser.h dx8wrapper.cpp dx8wrapper.h dynamesh.cpp @@ -243,14 +241,7 @@ target_include_directories(corei_ww3d2 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}" ) -if (MSVC AND NOT IS_VS6_BUILD) - target_link_libraries(corei_ww3d2 INTERFACE - comsuppw - ) -endif() - target_link_libraries(corei_ww3d2 INTERFACE - core_browserengine core_wwlib core_wwmath ) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp deleted file mode 100644 index bb5a8c63aeb..00000000000 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp +++ /dev/null @@ -1,260 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//****************************************************************************************** -// -// Earth And Beyond -// Copyright (c) 2002 Electronic Arts , Inc. - Westwood Studios -// -// File Name : dx8webbrowser.cpp -// Description : Implementation of D3D Embedded Browser wrapper. -// Author : Darren Schueller -// Date of Creation : 6/4/2002 -// -//****************************************************************************************** -// $Header: $ -//****************************************************************************************** - -#include "dx8webbrowser.h" -#include "ww3d.h" -#include "dx8wrapper.h" - -#if ENABLE_EMBEDDED_BROWSER - -#if defined(_MSC_VER) && _MSC_VER < 1300 - -// Import the Browser Type Library -#import "EABrowserEngine/BrowserEngine.tlb" no_namespace - -#else - -#ifdef __MINGW32__ -#include "Utility/comsupp_compat.h" // MinGW COM support compatibility -#endif -#include -#include - -#include "EABrowserEngine/BrowserEngine.h" - -typedef _com_ptr_t<_com_IIID> IFEBrowserEngine2Ptr; - -#endif - -static IFEBrowserEngine2Ptr pBrowser = 0; - -HWND DX8WebBrowser::hWnd = nullptr; - -bool DX8WebBrowser::Initialize( const char* badpageurl, - const char* loadingpageurl, - const char* mousefilename, - const char* mousebusyfilename) -{ - if(pBrowser == 0) - { - // Initialize COM - CoInitialize(nullptr); - - // Create an instance of the browser control - HRESULT hr = pBrowser.CreateInstance(__uuidof(FEBrowserEngine2)); - - if(hr == REGDB_E_CLASSNOTREG) - { - HMODULE lib = ::LoadLibrary("BrowserEngine.DLL"); - if(lib) - { - FARPROC proc = ::GetProcAddress(lib,"DllRegisterServer"); - if(proc) - { - proc(); - // Create an instance of the browser control - hr = pBrowser.CreateInstance(__uuidof(FEBrowserEngine2)); - } - FreeLibrary(lib); - } - } - - // Initialize the browser. - if(hr == S_OK) - { - hWnd = (HWND)WW3D::Get_Window(); - pBrowser->Initialize(reinterpret_cast(DX8Wrapper::_Get_D3D_Device8())); - - if(badpageurl) - pBrowser->put_BadPageURL(_bstr_t(badpageurl)); - - if(loadingpageurl) - pBrowser->put_LoadingPageURL(_bstr_t(loadingpageurl)); - - if(mousefilename) - pBrowser->put_MouseFileName(_bstr_t(mousefilename)); - - if(mousebusyfilename) - pBrowser->put_MouseBusyFileName(_bstr_t(mousebusyfilename)); - } - else - { - pBrowser = 0; - return false; - } - } - - return true; -} - -void DX8WebBrowser::Shutdown() -{ - if(pBrowser) - { - // Shutdown the browser - pBrowser->Shutdown(); - - // Release the smart pointer. - pBrowser = 0; - - hWnd = nullptr; - - // Shut down COM - CoUninitialize(); - } -} - - -// ****************************************************************************************** -// * Function Name: DX8WebBrowser::Update -// ****************************************************************************************** -// * Description: Updates the browser image surfaces by copying the bits from the browser -// * DCs to the D3D Image surfaces. -// * -// * Return Type: -// * -// * Argument: void -// * -// ****************************************************************************************** -void DX8WebBrowser::Update() -{ - if(pBrowser) pBrowser->D3DUpdate(); -}; - - -// ****************************************************************************************** -// * Function Name: DX8WebBrowser::Render -// ****************************************************************************************** -// * Description: Draws all browsers to the back buffer. -// * -// * Return Type: -// * -// * Argument: int backbufferindex -// * -// ****************************************************************************************** -void DX8WebBrowser::Render(int backbufferindex) -{ - if(pBrowser) pBrowser->D3DRender(backbufferindex); -}; - -// ****************************************************************************************** -// * Function Name: DX8WebBrowser::CreateBrowser -// ****************************************************************************************** -// * Description: Creates a browser window. -// * -// * Return Type: -// * -// * Argument: const char* browsername - This is a "name" used to identify the -// * browser instance. Multiple browsers can -// * be created, and are referenced using this name. -// * Argument: const char* url - The url to display. -// * Argument: int x - The position and size of the browser (in pixels) -// * Argument: int y -// * Argument: int w -// * Argument: int h -// * Argument: int updateticks - When non-zero, this forces the browser image to get updated -// * at the specified rate (number of milliseconds) regardless -// * of paint messages. When this is zero (the default) the browser -// * image is only updated whenever a paint message is received. -// * -// ****************************************************************************************** -void DX8WebBrowser::CreateBrowser(const char* browsername, const char* url, int x, int y, int w, int h, int updateticks, LONG options, LPDISPATCH gamedispatch) -{ - WWDEBUG_SAY(("DX8WebBrowser::CreateBrowser - Creating browser with the name %s, url = %s, (x, y, w, h) = (%d, %d, %d, %d), update ticks = %d", browsername, url, x, y, h, w, updateticks)); - if(pBrowser) - { - _bstr_t brsname(browsername); - pBrowser->CreateBrowser(brsname, _bstr_t(url), (long)(intptr_t)hWnd, x, y, w, h, options, gamedispatch); - pBrowser->SetUpdateRate(brsname, updateticks); - } -} - - -// ****************************************************************************************** -// * Function Name: DX8WebBrowser::DestroyBrowser -// ****************************************************************************************** -// * Description: Destroys the specified browser. This closes the window and releases -// * the browser instance. -// * -// * Return Type: -// * -// * Argument: const char* browsername - The name of the browser to destroy. -// * -// ****************************************************************************************** -void DX8WebBrowser::DestroyBrowser(const char* browsername) -{ - WWDEBUG_SAY(("DX8WebBrowser::DestroyBrowser - destroying browser %s", browsername)); - if(pBrowser) - pBrowser->DestroyBrowser(_bstr_t(browsername)); -} - - -// ****************************************************************************************** -// * Function Name: DX8WebBrowser::Is_Browser_Open -// ****************************************************************************************** -// * Description: This function checks to see if a browser of the specified name exists and -// * is currently open. -// * -// * Return Type: -// * -// * Argument: const char* browsername - The name of the browser to test. -// * -// ****************************************************************************************** -bool DX8WebBrowser::Is_Browser_Open(const char* browsername) -{ - if(pBrowser == 0) return false; -#if defined(_MSC_VER) && _MSC_VER < 1300 - return (pBrowser->IsOpen(_bstr_t(browsername)) != 0); -#else - long isOpen; - return (pBrowser->IsOpen(_bstr_t(browsername), &isOpen) != 0); -#endif -} - -// ****************************************************************************************** -// * Function Name: DX8WebBrowser::Navigate -// ****************************************************************************************** -// * Description: This function causes the browser to navigate to the specified page. -// * -// * Return Type: -// * -// * Argument: const char* browsername - The name of the browser to test. -// * const char* url - The url to navigate to. -// * -// ****************************************************************************************** -void DX8WebBrowser::Navigate(const char* browsername, const char* url) -{ - if(pBrowser == 0) return; - pBrowser->Navigate(_bstr_t(browsername),_bstr_t(url)); -} - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h deleted file mode 100644 index f3170e79804..00000000000 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h +++ /dev/null @@ -1,90 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//****************************************************************************************** -// -// Earth And Beyond -// Copyright (c) 2002 Electronic Arts , Inc. - Westwood Studios -// -// File Name : dx8webbrowser.h -// Description : Implementation of D3D Embedded Browser Wrapper -// Author : Darren Schueller -// Date of Creation : 6/4/2002 -// -//****************************************************************************************** -// $Header: $ -//****************************************************************************************** - -#pragma once - -#include -#include "d3d8.h" - -// *********************************** -// Set this to 0 to remove all embedded browser code. -// -#define ENABLE_EMBEDDED_BROWSER 1 -// -// *********************************** - -#if ENABLE_EMBEDDED_BROWSER - -// These options must match the browser option bits defined in the BrowserEngine code. -// Look in febrowserengine.h -#define BROWSEROPTION_SCROLLBARS 0x0001 -#define BROWSEROPTION_3DBORDER 0x0002 - -struct IDirect3DDevice8; - -/** -** DX8WebBrowser -** -** DX8 interface wrapper class. This encapsulates the BrowserEngine interface. -*/ -class DX8WebBrowser -{ -public: - - static bool Initialize( const char* badpageurl = 0, - const char* loadingpageurl = 0, - const char* mousefilename = 0, - const char* mousebusyfilename = 0); //Initialize the Embedded Browser - - static void Shutdown(); // Shutdown the embedded browser. Will close any open browsers. - - static void Update(); // Copies all browser contexts to D3D Image surfaces. - static void Render(int backbufferindex); //Draws all browsers to the backbuffer. - - // Creates a browser with the specified name - static void CreateBrowser(const char* browsername, const char* url, int x, int y, int w, int h, int updateticks = 0, LONG options = BROWSEROPTION_SCROLLBARS | BROWSEROPTION_3DBORDER, LPDISPATCH gamedispatch = 0); - - // Destroys the browser with the specified name - static void DestroyBrowser(const char* browsername); - - // Returns true if a browser with the specified name is open. - static bool Is_Browser_Open(const char* browsername); - - // Navigates the specified browser to the specified page. - static void Navigate(const char* browsername, const char* url); - -private: - // The window handle of the application. This is initialized by Initialize(). - static HWND hWnd; -}; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp index 1303cfbd2f2..cc0de4c1af4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp @@ -51,7 +51,6 @@ #endif #include "dx8wrapper.h" -#include "dx8webbrowser.h" #include "dx8fvf.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" @@ -1679,13 +1678,7 @@ void DX8Wrapper::Begin_Scene() { DX8_THREAD_ASSERT(); -#if ENABLE_EMBEDDED_BROWSER - DX8WebBrowser::Update(); -#endif - DX8CALL(BeginScene()); - - DX8WebBrowser::Update(); } void DX8Wrapper::End_Scene(bool flip_frames) @@ -1693,8 +1686,6 @@ void DX8Wrapper::End_Scene(bool flip_frames) DX8_THREAD_ASSERT(); DX8CALL(EndScene()); - DX8WebBrowser::Render(0); - if (flip_frames) { DX8_Assert(); HRESULT hr; diff --git a/Dependencies/Utility/CMakeLists.txt b/Dependencies/Utility/CMakeLists.txt index b49fb225373..7fe2b05aa09 100644 --- a/Dependencies/Utility/CMakeLists.txt +++ b/Dependencies/Utility/CMakeLists.txt @@ -7,7 +7,6 @@ set(UTILITY_SRC Utility/atomic_x86interlocked.inl Utility/bit_adapter.h Utility/compat.h - Utility/comsupp_compat.h Utility/endian_compat.h Utility/fstream_adapter.h Utility/hash_map_adapter.h diff --git a/Dependencies/Utility/Utility/comsupp_compat.h b/Dependencies/Utility/Utility/comsupp_compat.h deleted file mode 100644 index 8d58c35c5d4..00000000000 --- a/Dependencies/Utility/Utility/comsupp_compat.h +++ /dev/null @@ -1,149 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2026 TheSuperHackers -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -/** - * @file comsupp_compat.h - * @brief COM Support compatibility layer for MinGW-w64 - * - * Provides _com_util::ConvertStringToBSTR() and ConvertBSTRToString() - * as header-only implementations for MinGW-w64 builds. - * - * These functions are required by the _bstr_t class (from ReactOS comutil.h) - * for char* <-> BSTR conversions. They are called internally when constructing - * _bstr_t objects from C strings or converting _bstr_t back to char*. - * - * Used indirectly by: - * - Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp (8+ _bstr_t constructions) - * - Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h (_bstr_t usage) - * - * MinGW-w64 provides COM error handling (comdef.h) but lacks the string - * conversion utilities. ReactOS provides comsupp.cpp with implementations, - * but we use this header-only version to avoid building/linking an extra - * library. This must be included BEFORE comutil.h to provide definitions - * before _bstr_t's inline methods are instantiated. - * - * @note Include this header before in MinGW builds to provide - * symbol definitions for _bstr_t's internal string conversion calls. - * Without this, you will get "undefined reference" linker errors. - */ - -#pragma once - -#ifdef __MINGW32__ - -#include -#include -#include -#include - -// MinGW-w64 14 and later implement these two functions inline in comutil.h, -// which comdef.h includes, so defining them again here is a redefinition error. -#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 14 - -namespace _com_util -{ - -inline BSTR WINAPI ConvertStringToBSTR(const char *pSrc) -{ - DWORD cwch; - BSTR wsOut = nullptr; - - if (!pSrc) - return nullptr; - - // Compute the needed size with the null terminator - cwch = MultiByteToWideChar(CP_ACP, 0, pSrc, -1, nullptr, 0); - if (cwch == 0) - return nullptr; - - // Allocate the BSTR (without the null terminator) - wsOut = SysAllocStringLen(nullptr, cwch - 1); - if (!wsOut) - { - _com_issue_error(HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY)); - return nullptr; - } - - // Convert the string - if (MultiByteToWideChar(CP_ACP, 0, pSrc, -1, wsOut, cwch) == 0) - { - // We failed, clean everything up - cwch = GetLastError(); - - SysFreeString(wsOut); - wsOut = nullptr; - - _com_issue_error(!IS_ERROR(cwch) ? HRESULT_FROM_WIN32(cwch) : cwch); - } - - return wsOut; -} - -inline char* WINAPI ConvertBSTRToString(BSTR pSrc) -{ - DWORD cb, cwch; - char *szOut = nullptr; - - if (!pSrc) - return nullptr; - - // Retrieve the size of the BSTR with the null terminator - cwch = SysStringLen(pSrc) + 1; - - // Compute the needed size with the null terminator - cb = WideCharToMultiByte(CP_ACP, 0, pSrc, cwch, nullptr, 0, nullptr, nullptr); - if (cb == 0) - { - cwch = GetLastError(); - _com_issue_error(!IS_ERROR(cwch) ? HRESULT_FROM_WIN32(cwch) : cwch); - return nullptr; - } - - // Allocate the string - szOut = (char*)::operator new(cb * sizeof(char)); - if (!szOut) - { - _com_issue_error(HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY)); - return nullptr; - } - - // Convert the string and null-terminate - szOut[cb - 1] = '\0'; - if (WideCharToMultiByte(CP_ACP, 0, pSrc, cwch, szOut, cb, nullptr, nullptr) == 0) - { - // We failed, clean everything up - cwch = GetLastError(); - - ::operator delete(szOut); - szOut = nullptr; - - _com_issue_error(!IS_ERROR(cwch) ? HRESULT_FROM_WIN32(cwch) : cwch); - } - - return szOut; -} - -} - -#endif // __MINGW64_VERSION_MAJOR < 14 - -// Provide vtMissing global variable -// Use inline variable (C++17) to avoid multiple definition errors -inline _variant_t vtMissing(DISP_E_PARAMNOTFOUND, VT_ERROR); - -#endif // __MINGW32__ diff --git a/Generals/.gitignore b/Generals/.gitignore index da1b4ececb4..b2f7593f91f 100644 --- a/Generals/.gitignore +++ b/Generals/.gitignore @@ -24,9 +24,6 @@ Max4Hybrid /Code/gameenginedevice/Lib/GameEngineDeviceInternal.lib /Code/Libraries/Lib/Benchmark.lib /Code/Libraries/Lib/BenchmarkD.lib -/Code/Libraries/Lib/EABrowserDispatch.lib -/Code/Libraries/Lib/EABrowserDispatchD.lib -/Code/Libraries/Lib/EABrowserDispatchI.lib /Code/Libraries/Lib/GameSpyHTTP.lib /Code/Libraries/Lib/GameSpyHTTPDebug.lib /Code/Libraries/Lib/GameSpyHTTPInternal.lib @@ -75,11 +72,6 @@ Max4Hybrid # Generated files generatedVersion.h -BrowserDispatch.tli -BrowserDispatch.tlh -BrowserDispatch_i.c -BrowserDispatch.h -BrowserDispatch.tlb /Code/Tools/CRCDiff/out.html # Visual C++ files diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt index 386f87e8937..0340e0e1691 100644 --- a/Generals/Code/GameEngine/CMakeLists.txt +++ b/Generals/Code/GameEngine/CMakeLists.txt @@ -507,8 +507,6 @@ set(GAMEENGINE_SRC # Include/GameNetwork/Transport.h # Include/GameNetwork/udp.h # Include/GameNetwork/User.h -# Include/GameNetwork/WOLBrowser/FEBDispatch.h -# Include/GameNetwork/WOLBrowser/WebBrowser.h # Include/Precompiled/PreRTS.h # Source/Common/Audio/AudioEventRTS.cpp # Source/Common/Audio/AudioRequest.cpp @@ -557,7 +555,6 @@ set(GAMEENGINE_SRC # Source/Common/INI/INIVideo.cpp # Source/Common/INI/INIWater.cpp # Source/Common/INI/INIWeapon.cpp -# Source/Common/INI/INIWebpageURL.cpp # Source/Common/Language.cpp # Source/Common/MessageStream.cpp # Source/Common/MiniLog.cpp @@ -1050,7 +1047,6 @@ set(GAMEENGINE_SRC # Source/GameNetwork/Transport.cpp # Source/GameNetwork/udp.cpp # Source/GameNetwork/User.cpp -# Source/GameNetwork/WOLBrowser/WebBrowser.cpp # Source/Precompiled/PreRTS.cpp ) diff --git a/Generals/Code/GameEngine/Include/Common/GameEngine.h b/Generals/Code/GameEngine/Include/Common/GameEngine.h index 73862ffa8d3..fe1d4f45588 100644 --- a/Generals/Code/GameEngine/Include/Common/GameEngine.h +++ b/Generals/Code/GameEngine/Include/Common/GameEngine.h @@ -48,7 +48,6 @@ class ModuleFactory; class ThingFactory; class FunctionLexicon; class Radar; -class WebBrowser; class ParticleSystemManager; class GameEngine : public SubsystemInterface @@ -100,7 +99,6 @@ class GameEngine : public SubsystemInterface virtual ThingFactory *createThingFactory() = 0; ///< Factory for the thing factory virtual FunctionLexicon *createFunctionLexicon() = 0; ///< Factory for Function Lexicon virtual Radar *createRadar(Bool dummy) = 0; ///< Factory for radar - virtual WebBrowser *createWebBrowser() = 0; ///< Factory for embedded browser virtual ParticleSystemManager* createParticleSystemManager(Bool dummy) = 0; virtual AudioManager *createAudioManager(Bool dummy) = 0; ///< Factory for Audio Manager diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp index 2736ff6ecd8..5cc8125b877 100644 --- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp @@ -100,7 +100,6 @@ #include "GameClient/GUICallbacks.h" #include "GameNetwork/NetworkInterface.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" #include "GameNetwork/LANAPI.h" #include "GameNetwork/GameSpy/GameResultsThread.h" #include "GameNetwork/GameSpy/PeerDefs.h" @@ -169,10 +168,6 @@ void initSubsystem( TheSubsystemList->initSubsystem(sys, path1, path2, pXfer, name); } -//------------------------------------------------------------------------------------------------- -extern HINSTANCE ApplicationHInstance; ///< our application instance -extern CComModule _Module; - //------------------------------------------------------------------------------------------------- static void updateTGAtoDDS(); @@ -251,8 +246,6 @@ GameEngine::GameEngine() m_logicTimeAccumulator = 0.0f; m_quitting = FALSE; m_isActive = FALSE; - - _Module.Init(nullptr, ApplicationHInstance, nullptr); } //------------------------------------------------------------------------------------------------- @@ -294,8 +287,6 @@ GameEngine::~GameEngine() Drawable::killStaticImages(); - _Module.Term(); - #ifdef PERF_TIMERS PerfGather::termPerfDump(); #endif @@ -498,7 +489,6 @@ void GameEngine::init() TheMetaMap->verifyMetaMap(); initSubsystem(TheActionManager,"TheActionManager", MSGNEW("GameEngineSubsystem") ActionManager(), nullptr); - //initSubsystem((CComObject *)TheWebBrowser,"(CComObject *)TheWebBrowser", (CComObject *)createWebBrowser(), nullptr); initSubsystem(TheGameStateMap,"TheGameStateMap", MSGNEW("GameEngineSubsystem") GameStateMap, nullptr ); initSubsystem(TheGameState,"TheGameState", MSGNEW("GameEngineSubsystem") GameState, nullptr ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp index 2729a2eb158..65900755f82 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp @@ -36,7 +36,6 @@ #include "GameClient/KeyDefs.h" #include "GameClient/GameWindowManager.h" #include "GameClient/MessageBox.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" // window ids ------------------------------------------------------------------------------------- static NameKeyType parentWindowID = NAMEKEY_INVALID; @@ -69,12 +68,6 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData ) //Load the listbox shiznit // PopulateReplayFileListbox(listboxReplayFiles); - //TheWebBrowser->createBrowserWindow("Westwood", windowLadder); - if (TheWebBrowser != nullptr) - { - TheWebBrowser->createBrowserWindow("MessageBoard", windowLadder); - } - // show menu layout->hide( FALSE ); @@ -89,11 +82,6 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData ) void WOLLadderScreenShutdown( WindowLayout *layout, void *userData ) { - if (TheWebBrowser != nullptr) - { - TheWebBrowser->closeBrowserWindow(windowLadder); - } - // hide menu layout->hide( TRUE ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp index 6edaba07101..8b7e3254edf 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp @@ -67,16 +67,10 @@ #include "GameNetwork/GameSpyOverlay.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" - - #ifdef ALLOW_NON_PROFILED_LOGIN Bool GameSpyUseProfiles = false; #endif // ALLOW_NON_PROFILED_LOGIN -static Bool webBrowserActive = FALSE; -static Bool useWebBrowserForTOS = FALSE; - static Bool isShuttingDown = false; static Bool buttonPushed = false; static const char *nextScreen = nullptr; @@ -737,14 +731,6 @@ void WOLLoginMenuShutdown( WindowLayout *layout, void *userData ) isShuttingDown = true; loggedInOK = false; TheWindowManager->clearTabList(); - if (webBrowserActive) - { - if (TheWebBrowser != nullptr) - { - TheWebBrowser->closeBrowserWindow(listboxTOS); - } - webBrowserActive = FALSE; - } // if we are shutting down for an immediate pop, skip the animations Bool popImmediate = *(Bool *)userData; @@ -1432,49 +1418,40 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg, else if ( controlID == buttonTOSID ) { parentTOS->winHide(FALSE); - useWebBrowserForTOS = FALSE;//loginPref->getBool("UseTOSBrowser", TRUE); - if (useWebBrowserForTOS && (TheWebBrowser != nullptr)) - { - TheWebBrowser->createBrowserWindow("TermsOfService", listboxTOS); - webBrowserActive = TRUE; - } - else + // The terms of service are a UTF-8 text file. + GadgetListBoxReset(listboxTOS); + AsciiString fileName; + fileName.format("Data\\%s\\TOS.txt", GetRegistryLanguage().str()); + File *theFile = TheFileSystem->openFile(fileName.str(), File::READ); + if (theFile) { - // Okay, no web browser. This means we're looking at a UTF-8 text file. - GadgetListBoxReset(listboxTOS); - AsciiString fileName; - fileName.format("Data\\%s\\TOS.txt", GetRegistryLanguage().str()); - File *theFile = TheFileSystem->openFile(fileName.str(), File::READ); - if (theFile) - { - Int size = theFile->size(); + Int size = theFile->size(); - char *fileBuf = new char[size]; - Color tosColor = GameMakeColor(255, 255, 255, 255); + char *fileBuf = new char[size]; + Color tosColor = GameMakeColor(255, 255, 255, 255); - Int bytesRead = theFile->read(fileBuf, size); - if (bytesRead == size && size > 2) + Int bytesRead = theFile->read(fileBuf, size); + if (bytesRead == size && size > 2) + { + fileBuf[size-1] = 0; // just to be safe + AsciiString asciiBuf = fileBuf+2; + AsciiString asciiLine; + while (asciiBuf.nextToken(&asciiLine, "\r\n")) { - fileBuf[size-1] = 0; // just to be safe - AsciiString asciiBuf = fileBuf+2; - AsciiString asciiLine; - while (asciiBuf.nextToken(&asciiLine, "\r\n")) - { - UnicodeString uniLine; - uniLine = UnicodeString(MultiByteToWideCharSingleLine(asciiLine.str()).c_str()); - uniLine.trimEnd(); - DEBUG_LOG(("adding TOS line: [%ls]", uniLine.str())); - GadgetListBoxAddEntryText(listboxTOS, uniLine, tosColor, -1); - } - + UnicodeString uniLine; + uniLine = UnicodeString(MultiByteToWideCharSingleLine(asciiLine.str()).c_str()); + uniLine.trimEnd(); + DEBUG_LOG(("adding TOS line: [%ls]", uniLine.str())); + GadgetListBoxAddEntryText(listboxTOS, uniLine, tosColor, -1); } - delete[] fileBuf; - fileBuf = nullptr; - - theFile->close(); - theFile = nullptr; } + + delete[] fileBuf; + fileBuf = nullptr; + + theFile->close(); + theFile = nullptr; } EnableLoginControls( FALSE ); buttonBack->winEnable(FALSE); @@ -1485,18 +1462,10 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg, EnableLoginControls( TRUE ); parentTOS->winHide(TRUE); - if (useWebBrowserForTOS && (TheWebBrowser != nullptr)) - { - if (listboxTOS != nullptr) - { - TheWebBrowser->closeBrowserWindow(listboxTOS); - } - } OptionPreferences optionPref; optionPref["SawTOS"] = "yes"; optionPref.write(); - webBrowserActive = FALSE; buttonBack->winEnable(TRUE); } break; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp index 403d17c9bea..b93c5d093f4 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp @@ -64,7 +64,6 @@ #include "GameNetwork/GameSpy/PersistentStorageThread.h" #include "GameNetwork/GameSpy/ThreadUtils.h" #include "GameNetwork/GameSpy/MainMenuUtils.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static Bool isShuttingDown = FALSE; diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt index 183f1e5fcec..1606f7f0af7 100644 --- a/Generals/Code/GameEngineDevice/CMakeLists.txt +++ b/Generals/Code/GameEngineDevice/CMakeLists.txt @@ -63,7 +63,6 @@ set(GAMEENGINEDEVICE_SRC # Include/W3DDevice/GameClient/W3DWater.h # Include/W3DDevice/GameClient/W3DWaterTracks.h Include/W3DDevice/GameClient/W3DWaypointBuffer.h - Include/W3DDevice/GameClient/W3DWebBrowser.h # Include/W3DDevice/GameClient/WorldHeightMap.h Include/W3DDevice/GameLogic/W3DGameLogic.h Include/W3DDevice/GameLogic/W3DGhostObject.h @@ -152,7 +151,6 @@ set(GAMEENGINEDEVICE_SRC # Source/W3DDevice/GameClient/W3DVideoBuffer.cpp # Source/W3DDevice/GameClient/W3DView.cpp Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp - Source/W3DDevice/GameClient/W3DWebBrowser.cpp # Source/W3DDevice/GameClient/Water/W3DWater.cpp # Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp # Source/W3DDevice/GameClient/Water/wave.nvp diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h deleted file mode 100644 index edd4c9a3e30..00000000000 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -** Command & Conquer Generals(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -///// W3DWebBrowser.h //////////////////////// -// July 2002, Bryan Cleveland - -#pragma once - -#include "GameNetwork/WOLBrowser/WebBrowser.h" - -class TextureClass; -class Image; -class GameWindow; - -class W3DWebBrowser : public WebBrowser -{ - public: - W3DWebBrowser(); - - virtual Bool createBrowserWindow(const char *tag, GameWindow *win) override; - virtual void closeBrowserWindow(GameWindow *win) override; - -}; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp deleted file mode 100644 index 0db28b01f53..00000000000 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* -** Command & Conquer Generals(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -////// W3DWebBrowser.cpp /////////////// -// July 2002 Bryan Cleveland - -#include "W3DDevice/GameClient/W3DWebBrowser.h" -#include "WW3D2/texture.h" -#include "WW3D2/textureloader.h" -#include "WW3D2/surfaceclass.h" -#include "GameClient/Image.h" -#include "GameClient/GameWindow.h" -#include "WWMath/vector2i.h" -#include -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8webbrowser.h" - -W3DWebBrowser::W3DWebBrowser() : WebBrowser() { -} - -Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win) -{ - - WinInstanceData *winData = win->winGetInstanceData(); - AsciiString windowName = winData->m_decoratedNameString; - - Int x, y, w, h; - - win->winGetSize(&w, &h); - win->winGetScreenPosition(&x, &y); - - WebBrowserURL *url = findURL( AsciiString(tag) ); - - if (url == nullptr) { - DEBUG_LOG(("W3DWebBrowser::createBrowserWindow - couldn't find URL for page %s", tag)); - return FALSE; - } - -#ifdef __GNUC__ - CComQIIDPtr idisp(m_dispatch); -#else - CComQIPtr idisp(m_dispatch); -#endif - if (m_dispatch == nullptr) - { - return FALSE; - } - - DX8WebBrowser::CreateBrowser(windowName.str(), url->m_url.str(), x, y, w, h, 0, BROWSEROPTION_SCROLLBARS | BROWSEROPTION_3DBORDER, (LPDISPATCH)this); - - return TRUE; -} - -void W3DWebBrowser::closeBrowserWindow(GameWindow *win) -{ - DX8WebBrowser::DestroyBrowser(win->winGetInstanceData()->m_decoratedNameString.str()); -} diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index 32389c93d3a..48d6f09563b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -58,8 +58,6 @@ set(WW3D2_SRC #dx8texman.h # dx8vertexbuffer.cpp # dx8vertexbuffer.h - #dx8webbrowser.cpp - #dx8webbrowser.h # dx8wrapper.cpp # dx8wrapper.h #dynamesh.cpp diff --git a/Generals/Code/Main/RTS.RC b/Generals/Code/Main/RTS.RC index b4e435f608e..df9bd7b594f 100644 --- a/Generals/Code/Main/RTS.RC +++ b/Generals/Code/Main/RTS.RC @@ -74,7 +74,6 @@ IDB_LOAD_SCREEN BITMAP DISCARDABLE "Install_Final.bmp" // // Generated from the TEXTINCLUDE 3 resource. // -1 TYPELIB "../Libraries/Include/EABrowserDispatch/BrowserDispatch.tlb" ///////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Run/BrowserEngine.dll b/Generals/Run/BrowserEngine.dll deleted file mode 100644 index a8a19e4b921..00000000000 Binary files a/Generals/Run/BrowserEngine.dll and /dev/null differ diff --git a/GeneralsMD/.gitignore b/GeneralsMD/.gitignore index 4ab0a25be27..39e41208202 100644 --- a/GeneralsMD/.gitignore +++ b/GeneralsMD/.gitignore @@ -26,9 +26,6 @@ Max4Hybrid /Code/gameenginedevice/Lib/GameEngineDeviceProfile.lib /Code/Libraries/Lib/Benchmark.lib /Code/Libraries/Lib/BenchmarkD.lib -/Code/Libraries/Lib/EABrowserDispatch.lib -/Code/Libraries/Lib/EABrowserDispatchD.lib -/Code/Libraries/Lib/EABrowserDispatchI.lib /Code/Libraries/Lib/GameSpyHTTP.lib /Code/Libraries/Lib/GameSpyHTTPDebug.lib /Code/Libraries/Lib/GameSpyHTTPInternal.lib @@ -81,9 +78,6 @@ Max4Hybrid /Code/Libraries/Lib/WWUtilProfile.lib # Generated files -BrowserDispatch_i.c -BrowserDispatch.h -BrowserDispatch.tlb generatedVersion.h # Generated shader headers diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt index d2e14c0b5e3..fb3b718bf66 100644 --- a/GeneralsMD/Code/GameEngine/CMakeLists.txt +++ b/GeneralsMD/Code/GameEngine/CMakeLists.txt @@ -545,8 +545,6 @@ set(GAMEENGINE_SRC # Include/GameNetwork/Transport.h # Include/GameNetwork/udp.h # Include/GameNetwork/User.h -# Include/GameNetwork/WOLBrowser/FEBDispatch.h -# Include/GameNetwork/WOLBrowser/WebBrowser.h # Include/Precompiled/PreRTS.h # Source/Common/Audio/AudioEventRTS.cpp # Source/Common/Audio/AudioRequest.cpp @@ -596,7 +594,6 @@ set(GAMEENGINE_SRC # Source/Common/INI/INIVideo.cpp # Source/Common/INI/INIWater.cpp # Source/Common/INI/INIWeapon.cpp -# Source/Common/INI/INIWebpageURL.cpp # Source/Common/Language.cpp # Source/Common/MessageStream.cpp # Source/Common/MiniLog.cpp @@ -1126,7 +1123,6 @@ set(GAMEENGINE_SRC # Source/GameNetwork/Transport.cpp # Source/GameNetwork/udp.cpp # Source/GameNetwork/User.cpp -# Source/GameNetwork/WOLBrowser/WebBrowser.cpp # Source/Precompiled/PreRTS.cpp ) diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h index 36b1d548ec3..51adb17339e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h @@ -48,7 +48,6 @@ class ModuleFactory; class ThingFactory; class FunctionLexicon; class Radar; -class WebBrowser; class ParticleSystemManager; class GameEngine : public SubsystemInterface @@ -99,7 +98,6 @@ class GameEngine : public SubsystemInterface virtual ThingFactory *createThingFactory() = 0; ///< Factory for the thing factory virtual FunctionLexicon *createFunctionLexicon() = 0; ///< Factory for Function Lexicon virtual Radar *createRadar(Bool dummy) = 0; ///< Factory for radar - virtual WebBrowser *createWebBrowser() = 0; ///< Factory for embedded browser virtual ParticleSystemManager* createParticleSystemManager(Bool dummy) = 0; virtual AudioManager *createAudioManager(Bool dummy) = 0; ///< Factory for Audio Manager diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp index 57d729b6f4e..9c30156e27c 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp @@ -102,7 +102,6 @@ #include "GameClient/GUICallbacks.h" #include "GameNetwork/NetworkInterface.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" #include "GameNetwork/LANAPI.h" #include "GameNetwork/GameSpy/GameResultsThread.h" @@ -167,10 +166,6 @@ void initSubsystem( TheSubsystemList->initSubsystem(sys, path1, path2, pXfer, name); } -//------------------------------------------------------------------------------------------------- -extern HINSTANCE ApplicationHInstance; ///< our application instance -extern CComModule _Module; - //------------------------------------------------------------------------------------------------- static void updateTGAtoDDS(); @@ -249,8 +244,6 @@ GameEngine::GameEngine() m_logicTimeAccumulator = 0.0f; m_quitting = FALSE; m_isActive = FALSE; - - _Module.Init(nullptr, ApplicationHInstance, nullptr); } //------------------------------------------------------------------------------------------------- @@ -298,8 +291,6 @@ GameEngine::~GameEngine() Drawable::killStaticImages(); - _Module.Term(); - #ifdef PERF_TIMERS PerfGather::termPerfDump(); #endif @@ -628,7 +619,6 @@ void GameEngine::init() initSubsystem(TheActionManager,"TheActionManager", MSGNEW("GameEngineSubsystem") ActionManager(), nullptr); - //initSubsystem((CComObject *)TheWebBrowser,"(CComObject *)TheWebBrowser", (CComObject *)createWebBrowser(), nullptr); initSubsystem(TheGameStateMap,"TheGameStateMap", MSGNEW("GameEngineSubsystem") GameStateMap, nullptr ); initSubsystem(TheGameState,"TheGameState", MSGNEW("GameEngineSubsystem") GameState, nullptr ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp index af3f8f4b1fe..f24567a1478 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp @@ -36,7 +36,6 @@ #include "GameClient/KeyDefs.h" #include "GameClient/GameWindowManager.h" #include "GameClient/MessageBox.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" // window ids ------------------------------------------------------------------------------------- static NameKeyType parentWindowID = NAMEKEY_INVALID; @@ -69,12 +68,6 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData ) //Load the listbox shiznit // PopulateReplayFileListbox(listboxReplayFiles); - //TheWebBrowser->createBrowserWindow("Westwood", windowLadder); - if (TheWebBrowser != nullptr) - { - TheWebBrowser->createBrowserWindow("MessageBoard", windowLadder); - } - // show menu layout->hide( FALSE ); @@ -89,11 +82,6 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData ) void WOLLadderScreenShutdown( WindowLayout *layout, void *userData ) { - if (TheWebBrowser != nullptr) - { - TheWebBrowser->closeBrowserWindow(windowLadder); - } - // hide menu layout->hide( TRUE ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp index 25d49d2daa2..b7a4d09c7ee 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp @@ -67,16 +67,10 @@ #include "GameNetwork/GameSpyOverlay.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" - - #ifdef ALLOW_NON_PROFILED_LOGIN Bool GameSpyUseProfiles = false; #endif // ALLOW_NON_PROFILED_LOGIN -static Bool webBrowserActive = FALSE; -static Bool useWebBrowserForTOS = FALSE; - static Bool isShuttingDown = false; static Bool buttonPushed = false; static const char *nextScreen = nullptr; @@ -737,14 +731,6 @@ void WOLLoginMenuShutdown( WindowLayout *layout, void *userData ) isShuttingDown = true; loggedInOK = false; TheWindowManager->clearTabList(); - if (webBrowserActive) - { - if (TheWebBrowser != nullptr) - { - TheWebBrowser->closeBrowserWindow(listboxTOS); - } - webBrowserActive = FALSE; - } // if we are shutting down for an immediate pop, skip the animations Bool popImmediate = *(Bool *)userData; @@ -1432,49 +1418,40 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg, else if ( controlID == buttonTOSID ) { parentTOS->winHide(FALSE); - useWebBrowserForTOS = FALSE;//loginPref->getBool("UseTOSBrowser", TRUE); - if (useWebBrowserForTOS && (TheWebBrowser != nullptr)) - { - TheWebBrowser->createBrowserWindow("TermsOfService", listboxTOS); - webBrowserActive = TRUE; - } - else + // The terms of service are a UTF-8 text file. + GadgetListBoxReset(listboxTOS); + AsciiString fileName; + fileName.format("Data\\%s\\TOS.txt", GetRegistryLanguage().str()); + File *theFile = TheFileSystem->openFile(fileName.str(), File::READ); + if (theFile) { - // Okay, no web browser. This means we're looking at a UTF-8 text file. - GadgetListBoxReset(listboxTOS); - AsciiString fileName; - fileName.format("Data\\%s\\TOS.txt", GetRegistryLanguage().str()); - File *theFile = TheFileSystem->openFile(fileName.str(), File::READ); - if (theFile) - { - Int size = theFile->size(); + Int size = theFile->size(); - char *fileBuf = new char[size]; - Color tosColor = GameMakeColor(255, 255, 255, 255); + char *fileBuf = new char[size]; + Color tosColor = GameMakeColor(255, 255, 255, 255); - Int bytesRead = theFile->read(fileBuf, size); - if (bytesRead == size && size > 2) + Int bytesRead = theFile->read(fileBuf, size); + if (bytesRead == size && size > 2) + { + fileBuf[size-1] = 0; // just to be safe + AsciiString asciiBuf = fileBuf+2; + AsciiString asciiLine; + while (asciiBuf.nextToken(&asciiLine, "\r\n")) { - fileBuf[size-1] = 0; // just to be safe - AsciiString asciiBuf = fileBuf+2; - AsciiString asciiLine; - while (asciiBuf.nextToken(&asciiLine, "\r\n")) - { - UnicodeString uniLine; - uniLine = UnicodeString(MultiByteToWideCharSingleLine(asciiLine.str()).c_str()); - uniLine.trimEnd(); - DEBUG_LOG(("adding TOS line: [%ls]", uniLine.str())); - GadgetListBoxAddEntryText(listboxTOS, uniLine, tosColor, -1); - } - + UnicodeString uniLine; + uniLine = UnicodeString(MultiByteToWideCharSingleLine(asciiLine.str()).c_str()); + uniLine.trimEnd(); + DEBUG_LOG(("adding TOS line: [%ls]", uniLine.str())); + GadgetListBoxAddEntryText(listboxTOS, uniLine, tosColor, -1); } - delete[] fileBuf; - fileBuf = nullptr; - - theFile->close(); - theFile = nullptr; } + + delete[] fileBuf; + fileBuf = nullptr; + + theFile->close(); + theFile = nullptr; } EnableLoginControls( FALSE ); buttonBack->winEnable(FALSE); @@ -1485,18 +1462,10 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg, EnableLoginControls( TRUE ); parentTOS->winHide(TRUE); - if (useWebBrowserForTOS && (TheWebBrowser != nullptr)) - { - if (listboxTOS != nullptr) - { - TheWebBrowser->closeBrowserWindow(listboxTOS); - } - } OptionPreferences optionPref; optionPref["SawTOS"] = "yes"; optionPref.write(); - webBrowserActive = FALSE; buttonBack->winEnable(TRUE); } break; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp index 34c37a9b7b5..e9184ab6982 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp @@ -66,7 +66,6 @@ #include "GameNetwork/GameSpy/PersistentStorageThread.h" #include "GameNetwork/GameSpy/ThreadUtils.h" #include "GameNetwork/GameSpy/MainMenuUtils.h" -#include "GameNetwork/WOLBrowser/WebBrowser.h" // PRIVATE DATA /////////////////////////////////////////////////////////////////////////////////// static Bool isShuttingDown = FALSE; diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt index 88699a5dd68..9d65ff0b95c 100644 --- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt +++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt @@ -74,7 +74,6 @@ set(GAMEENGINEDEVICE_SRC # Include/W3DDevice/GameClient/W3DWater.h # Include/W3DDevice/GameClient/W3DWaterTracks.h Include/W3DDevice/GameClient/W3DWaypointBuffer.h - Include/W3DDevice/GameClient/W3DWebBrowser.h # Include/W3DDevice/GameClient/WorldHeightMap.h Include/W3DDevice/GameLogic/W3DGameLogic.h Include/W3DDevice/GameLogic/W3DGhostObject.h @@ -167,7 +166,6 @@ set(GAMEENGINEDEVICE_SRC # Source/W3DDevice/GameClient/W3DVideoBuffer.cpp # Source/W3DDevice/GameClient/W3DView.cpp Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp - Source/W3DDevice/GameClient/W3DWebBrowser.cpp # Source/W3DDevice/GameClient/Water/W3DWater.cpp # Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp # Source/W3DDevice/GameClient/WorldHeightMap.cpp diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h deleted file mode 100644 index 95550673226..00000000000 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -///// W3DWebBrowser.h //////////////////////// -// July 2002, Bryan Cleveland - -#pragma once - -#include "GameNetwork/WOLBrowser/WebBrowser.h" - -class TextureClass; -class Image; -class GameWindow; - -class W3DWebBrowser : public WebBrowser -{ - public: - W3DWebBrowser(); - - virtual Bool createBrowserWindow(const char *tag, GameWindow *win) override; - virtual void closeBrowserWindow(GameWindow *win) override; - -}; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp deleted file mode 100644 index 1b7f2915ad1..00000000000 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* -** Command & Conquer Generals Zero Hour(tm) -** Copyright 2025 Electronic Arts Inc. -** -** This program is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 3 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program. If not, see . -*/ - -//////////////////////////////////////////////////////////////////////////////// -// // -// (c) 2001-2003 Electronic Arts Inc. // -// // -//////////////////////////////////////////////////////////////////////////////// - -////// W3DWebBrowser.cpp /////////////// -// July 2002 Bryan Cleveland - -#include "W3DDevice/GameClient/W3DWebBrowser.h" -#include "WW3D2/texture.h" -#include "WW3D2/textureloader.h" -#include "WW3D2/surfaceclass.h" -#include "GameClient/Image.h" -#include "GameClient/GameWindow.h" -#include "WWMath/vector2i.h" -#include -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8webbrowser.h" - -W3DWebBrowser::W3DWebBrowser() : WebBrowser() { -} - -Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win) -{ - - WinInstanceData *winData = win->winGetInstanceData(); - AsciiString windowName = winData->m_decoratedNameString; - - Int x, y, w, h; - - win->winGetSize(&w, &h); - win->winGetScreenPosition(&x, &y); - - WebBrowserURL *url = findURL( AsciiString(tag) ); - - if (url == nullptr) { - DEBUG_LOG(("W3DWebBrowser::createBrowserWindow - couldn't find URL for page %s", tag)); - return FALSE; - } - -#ifdef __GNUC__ - CComQIIDPtr idisp(m_dispatch); -#else - CComQIPtr idisp(m_dispatch); -#endif - if (m_dispatch == nullptr) - { - return FALSE; - } - - DX8WebBrowser::CreateBrowser(windowName.str(), url->m_url.str(), x, y, w, h, 0, BROWSEROPTION_SCROLLBARS | BROWSEROPTION_3DBORDER, (LPDISPATCH)this); - - return TRUE; -} - -void W3DWebBrowser::closeBrowserWindow(GameWindow *win) -{ - DX8WebBrowser::DestroyBrowser(win->winGetInstanceData()->m_decoratedNameString.str()); -} diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index 9401d58c333..757e1078072 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -60,8 +60,6 @@ set(WW3D2_SRC #dx8texman.h # dx8vertexbuffer.cpp # dx8vertexbuffer.h - #dx8webbrowser.cpp - #dx8webbrowser.h # dx8wrapper.cpp # dx8wrapper.h #dynamesh.cpp diff --git a/GeneralsMD/Run/BrowserEngine.dll b/GeneralsMD/Run/BrowserEngine.dll deleted file mode 100644 index a8a19e4b921..00000000000 Binary files a/GeneralsMD/Run/BrowserEngine.dll and /dev/null differ diff --git a/cmake/mingw.cmake b/cmake/mingw.cmake index 9883e0e84a2..2b5baba9124 100644 --- a/cmake/mingw.cmake +++ b/cmake/mingw.cmake @@ -69,11 +69,6 @@ if(MINGW) winmm # Multimedia (timeGetTime, etc.) ) - # Note: MinGW-w64 does not provide comsuppw (COM support utilities library). - # COM support utilities (_com_util::ConvertStringToBSTR, ConvertBSTRToString) - # are provided by Dependencies/Utility/Utility/comsupp_compat.h as header-only - # implementations. No library linking required. - # MinGW-w64 compatibility: Create d3dx8 as an alias to d3dx8d # MinGW-w64 only provides libd3dx8d.a (debug library), not libd3dx8.a # The min-dx8-sdk (dx8.cmake) handles this correctly via d3d8lib interface target, diff --git a/cmake/reactos-atl.cmake b/cmake/reactos-atl.cmake index f572bc10997..d48fab8a850 100644 --- a/cmake/reactos-atl.cmake +++ b/cmake/reactos-atl.cmake @@ -31,10 +31,6 @@ if(MINGW) "${reactos_atl_SOURCE_DIR}/sdk/lib/atl" ) - # COM support (_com_util::ConvertStringToBSTR and ConvertBSTRToString) - # is provided by Dependencies/Utility/Utility/comsupp_compat.h as a - # header-only implementation. No library needs to be built or linked. - # Add required ATL defines for MinGW compatibility # NOTE: Do NOT define _ATL_NO_AUTOMATIC_NAMESPACE # The codebase uses ATL types (CComModule, CComObject, CString, etc.) @@ -52,7 +48,6 @@ if(MINGW) message(STATUS "ReactOS ATL headers: ${reactos_atl_SOURCE_DIR}/sdk/lib/atl") message(STATUS "ReactOS PSEH headers: ${reactos_atl_SOURCE_DIR}/sdk/lib/pseh/include") - message(STATUS "COM support (comsupp): Header-only in Dependencies/Utility/Utility/comsupp_compat.h") message(STATUS "Using ReactOS PSEH in C++-compatible dummy mode (_USE_DUMMY_PSEH)") message(STATUS "Using MinGW-w64 CRT headers (NOT ReactOS CRT)") endif() diff --git a/cmake/widl.cmake b/cmake/widl.cmake deleted file mode 100644 index b1cb8fd1082..00000000000 --- a/cmake/widl.cmake +++ /dev/null @@ -1,153 +0,0 @@ -# WIDL (Wine IDL Compiler) detection and configuration -# Used as MIDL replacement for MinGW-w64 builds - -if(MINGW) - # Find widl executable - find_program(WIDL_EXECUTABLE - NAMES widl widl-stable - DOC "Wine IDL compiler for MinGW-w64" - ) - - if(WIDL_EXECUTABLE) - # Get widl version - execute_process( - COMMAND ${WIDL_EXECUTABLE} -V - OUTPUT_VARIABLE WIDL_VERSION_OUTPUT - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - if(WIDL_VERSION_OUTPUT MATCHES "Wine IDL Compiler version ([0-9.]+)") - set(WIDL_VERSION ${CMAKE_MATCH_1}) - message(STATUS "Found widl: ${WIDL_EXECUTABLE} (version ${WIDL_VERSION})") - else() - message(STATUS "Found widl: ${WIDL_EXECUTABLE}") - endif() - - set(IDL_COMPILER ${WIDL_EXECUTABLE}) - set(IDL_COMPILER_FOUND TRUE) - - # Detect Wine include paths dynamically - find_path(WINE_WINDOWS_INCLUDE_DIR - NAMES oaidl.idl - PATHS - /usr/include/wine/wine/windows - /usr/include/wine/windows - /usr/include/wine-development/windows - /opt/wine-stable/include/wine/windows - /usr/local/include/wine/windows - NO_DEFAULT_PATH - NO_CMAKE_FIND_ROOT_PATH - DOC "Wine Windows headers directory" - ) - - if(WINE_WINDOWS_INCLUDE_DIR) - get_filename_component(WINE_BASE_INCLUDE_DIR "${WINE_WINDOWS_INCLUDE_DIR}/.." ABSOLUTE) - message(STATUS "Wine include directory: ${WINE_WINDOWS_INCLUDE_DIR}") - set(WIDL_INCLUDE_PATHS - -I${WINE_WINDOWS_INCLUDE_DIR} - -I${WINE_BASE_INCLUDE_DIR} - ) - else() - message(WARNING "Wine include directory not found. widl may fail to compile IDL files.") - set(WIDL_INCLUDE_PATHS "") - endif() - - else() - message(WARNING "widl not found. Install with: apt-get install wine-stable-dev (Debian/Ubuntu) or wine-devel (Fedora/RHEL)") - set(IDL_COMPILER_FOUND FALSE) - endif() - - # WIDL command function (compatible with MIDL) - function(add_idl_file target_name idl_file) - get_filename_component(idl_basename ${idl_file} NAME_WE) - get_filename_component(idl_dir ${idl_file} DIRECTORY) - - set(header_file "${CMAKE_CURRENT_BINARY_DIR}/${idl_basename}.h") - set(iid_file "${CMAKE_CURRENT_BINARY_DIR}/${idl_basename}_i.c") - - # Build widl flags with dynamically detected Wine paths - set(WIDL_FLAGS - --win32 - -I${idl_dir} - ${WIDL_INCLUDE_PATHS} - -D__WIDL__ - -DDECLSPEC_ALIGN\(x\)= - ) - - # Generate header file - add_custom_command( - OUTPUT ${header_file} - COMMAND ${IDL_COMPILER} - ${WIDL_FLAGS} - -h -o ${header_file} - ${idl_file} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${idl_file} - COMMENT "Compiling IDL to header with widl: ${idl_file}" - VERBATIM - ) - - # Generate IID file - add_custom_command( - OUTPUT ${iid_file} - COMMAND ${IDL_COMPILER} - ${WIDL_FLAGS} - -u -o ${iid_file} - ${idl_file} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${idl_file} - COMMENT "Compiling IDL to IID with widl: ${idl_file}" - VERBATIM - ) - - # Return output files to parent scope - set(${target_name}_HEADER ${header_file} PARENT_SCOPE) - set(${target_name}_IID ${iid_file} PARENT_SCOPE) - endfunction() - -elseif(MSVC) - # MSVC uses midl.exe - find_program(MIDL_EXECUTABLE - NAMES midl.exe midl - DOC "Microsoft IDL compiler" - ) - - if(MIDL_EXECUTABLE) - message(STATUS "Found midl: ${MIDL_EXECUTABLE}") - set(IDL_COMPILER ${MIDL_EXECUTABLE}) - set(IDL_COMPILER_FOUND TRUE) - else() - # midl.exe is usually in PATH with Visual Studio - set(IDL_COMPILER "midl.exe") - set(IDL_COMPILER_FOUND TRUE) - message(STATUS "Using midl.exe from PATH") - endif() - - # MIDL command function - function(add_idl_file target_name idl_file) - get_filename_component(idl_basename ${idl_file} NAME_WE) - - set(header_file "${CMAKE_CURRENT_BINARY_DIR}/${idl_basename}.h") - set(iid_file "${CMAKE_CURRENT_BINARY_DIR}/${idl_basename}_i.c") - - # Convert forward slashes to backslashes for MIDL - file(TO_NATIVE_PATH ${idl_file} idl_file_native) - - add_custom_command( - OUTPUT ${header_file} ${iid_file} - COMMAND ${IDL_COMPILER} "${idl_file_native}" /header ${idl_basename}.h /iid ${idl_basename}_i.c - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${idl_file} - COMMENT "Compiling IDL file ${idl_file} with midl" - VERBATIM - ) - - # Return output files to parent scope - set(${target_name}_HEADER ${header_file} PARENT_SCOPE) - set(${target_name}_IID ${iid_file} PARENT_SCOPE) - endfunction() -else() - message(WARNING "No IDL compiler configured for this platform") - set(IDL_COMPILER_FOUND FALSE) -endif()