Repository navigation
bugfix(w3d): Fix leaked surface copy in screenshot and movie capture - #636
Open
tintinhamans wants to merge 1 commit into
Open
tintinhamans wants to merge 1 commit into
tintinhamans wants to merge 1 commit into
Conversation
…heSuperHackers#3477) (cherry picked from commit fb2e2f0)
tintinhamans
force-pushed
the
arctic/go/fix/screenshot-surface-leak
branch
from
October 15, 2026 22:28
f0f5c52 to
c102097
Compare
tintinhamans
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
_Create_DX8_Surfacereturns a surface that already holds one reference.W3D_TakeCompressedScreenshotwraps it with theSurfaceClass(IDirect3DSurface8*)constructor, which goes throughAttachand takes a second one.~SurfaceClassreleases one, so every screenshot leaks a back buffer sized image surface.The copy is now built with
SurfaceClass(width, height, format), which owns the only reference. Same image surface, same blit, same lock. The probe capture inOnlineServices_Init.cppalready releases its raw surface and is not affected.This is the merged upstream TheSuperHackers#3477, cherry-picked as is. It also fixes the same leak in
WW3D::Make_Screen_ShotandWW3D::Update_Movie_Capture(ww3d.cpp, bothGeneralsandGeneralsMD), which the earlier version of this PR did not touch, and updates the copyright years inW3DScreenshotandstb_image_write_impl.cpp.