Repository navigation
refactor: Remove unused embedded web browser - #3691
Conversation
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
No actionable comments were generated in the recent review. WalkthroughThe change removes the embedded browser and its COM, IDL, rendering, and game-menu integrations from both game variants. The online login menu now displays terms from a language-specific text file. Browser-related build configuration and compatibility code are also removed. ChangesEmbedded browser removal
Estimated code review effort: 3 (Moderate) | ~25 minutes Change: Refactor Possibly related PRs
Suggested labels: Suggested reviewers: Merge Risk:
|
[Low impact] The PR appears safe to merge; no actionable defects were found.
|
Skyaero42
left a comment
There was a problem hiding this comment.
Probably used for ads and stuff
Nice cleanup
Upstream TheSuperHackers/GeneralsGameCode up to ee27e89 (19 commits, through TheSuperHackers#3691), with the DX9 side of their changes: - The embedded web browser removed (TheSuperHackers#3691): DX8WebBrowser's start-up, update, render and shutdown go, and with them dx8webbrowser.h, W3DWebBrowser.cpp in both trees and the core_browserengine link. Our edits there were d3d8 -> d3d9 includes only. Kept beside them: the RmlUi start-up in W3DDisplay::init, Begin_Scene's handling of an already-active scene (dx8wrapper.cpp), and WW3D2's d3d9 link. - Dynamic vertices written through VertexFormatXYZNDUV2 fields (TheSuperHackers#3671), our dynamic buffer's own layout: the streak renderer takes upstream's writes with its UVs still mapped into the particle atlas cell (6bae419); seglinerenderer merged as upstream wrote it. - max2w3d's libraries (TheSuperHackers#3679): upstream's list, d3d9 where it names d3d8lib - the fork has no d3d8lib target. The exporter is not built in this configuration. - Taken as they are: Targa header validation (TheSuperHackers#3572 - every loose, repo and archived TGA the game loads passes it), Convert_Color without a reinterpret (TheSuperHackers#3655), shore waves restored when a saved game loads (TheSuperHackers#3493), RawFileClass::Raw_Seek returning the position again (TheSuperHackers#3679), the special-power fixes (TheSuperHackers#3666 - in this retail-compatible build only MissileLauncherBuildingUpdate's crash fix changes anything), map cache and path helpers (TheSuperHackers#3107, TheSuperHackers#3444), the MinGW CI job (TheSuperHackers#3552). Checked before merging: the merged tree configured and built in a scratch worktree (z_generals Release, 0 errors); this commit's tree is that build's source. Six tools fail to build exactly as they do on main before the merge (ParticleEditor, DebugWindow, WorldBuilder, wdump, W3DView, the old tree's WW3D2). # Conflicts: # Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp # Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt # Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h # Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp # Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp # Core/Tools/WW3D/max2w3d/CMakeLists.txt # Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp # GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
This change removes the embedded web browser code. The game never creates a browser.
TheWebBrowseris never created. ItsinitSubsystemline was already commented out in bothGameEngine.cpp.WebBrowser::initis never called, so theWebpageURLINI blocks were never loaded.DX8WebBrowserwas still initialized inW3DDisplay(it loadedBrowserEngine.dll) and updated and rendered every frame, but no browser window was ever opened.Removed:
EABrowserDispatchandEABrowserEngine(IDL files and their libraries), andcmake/widl.cmakeDX8WebBrowser,WebBrowser,FEBDispatch.h,W3DWebBrowserandINIWebpageURL.cppBrowserEngine.dllfrom bothRunfolderscomsupp_compat.hand thecomsuppwlink, which only the browser usedCComModule _Moduleand itsInit/Termcalls inGameEngineTheWebBrowsercode in the WOL login and ladder menus. The terms of service are still read fromTOS.txt, as before.BrowserDispatch.tlbtype library in the GeneralsRTS.RCWith this change, MinGW builds no longer need widl, so the Wine install step in the MinGW CI job can be removed in #3675.
ATL is still used by
PreRTS.h. Removing it is left for a follow-up.Note:
DX8WebBrowser::Initializewas the only place the game calledCoInitialize. Nothing else in the game uses COM objects, but please check that the game still starts on Windows.AI USE
I used Claude Code to find all the browser references, make the removal and build both games with MinGW-w64. I reviewed the changes.