Skip to content

bugfix(w3d): Fix leaked surface copy in screenshot and movie capture #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tintinhamans wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −9
Open

bugfix(w3d): Fix leaked surface copy in screenshot and movie capture #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DScreenshot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
** Command & Conquer Generals Zero Hour(tm)
** Copyright 2025 TheSuperHackers
** 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
Expand Down
4 changes: 2 additions & 2 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
** Command & Conquer Generals Zero Hour(tm)
** Copyright 2025 TheSuperHackers
** 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
Expand Down Expand Up @@ -185,7 +185,7 @@ void W3D_TakeCompressedScreenshot(ScreenshotFormat format, Int jpegQuality)
return;
}

SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (DX8Wrapper::_Create_DX8_Surface(surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format)));
SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format));
DX8Wrapper::_Copy_DX8_Rects(surface->Peek_D3D_Surface(), nullptr, 0, surfaceCopy->Peek_D3D_Surface(), nullptr);

surface->Release_Ref();
Expand Down
4 changes: 2 additions & 2 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/stb_image_write_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
** Command & Conquer Generals(tm)
** Copyright 2025 TheSuperHackers
** 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
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ void WW3D::Make_Screen_Shot( const char * filename_base , const float gamma, con
SurfaceClass::SurfaceDescription surfaceDesc;
surface->Get_Description(surfaceDesc);

SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (DX8Wrapper::_Create_DX8_Surface(surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format)));
SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format));
DX8Wrapper::_Copy_DX8_Rects(surface->Peek_D3D_Surface(), nullptr, 0, surfaceCopy->Peek_D3D_Surface(), nullptr);

surface->Release_Ref();
Expand Down Expand Up @@ -1718,7 +1718,7 @@ void WW3D::Update_Movie_Capture()
SurfaceClass::SurfaceDescription surfaceDesc;
surface->Get_Description(surfaceDesc);

SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (DX8Wrapper::_Create_DX8_Surface(surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format)));
SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format));
DX8Wrapper::_Copy_DX8_Rects(surface->Peek_D3D_Surface(), nullptr, 0, surfaceCopy->Peek_D3D_Surface(), nullptr);

surface->Release_Ref();
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
#include "WW3D2/shdlib.h"
#include "WW3D2/framgrab.h"

#include "../../../GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h"#include "Lib/BaseType.h"

Check warning on line 123 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-vcpkg-profile+e 

 unexpected tokens following preprocessor directive - expected a newline

Check warning on line 123 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-vcpkg+e 

 unexpected tokens following preprocessor directive - expected a newline

Check warning on line 123 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-vcpkg-debug+e 

 unexpected tokens following preprocessor directive - expected a newline
#include "Lib/BaseType.h"


Expand Down Expand Up @@ -164,7 +164,7 @@
**
***********************************************************************************/

float WW3D::LogicFrameTimeMs = 1000.0f / WWSyncPerSecond; // initialized to something to avoid division by zero on first use

Check warning on line 167 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-vcpkg-profile+e 

 operator '/': deprecated between enumerations and floating-point types

Check warning on line 167 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-vcpkg+e 

 operator '/': deprecated between enumerations and floating-point types

Check warning on line 167 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-vcpkg-debug+e 

 operator '/': deprecated between enumerations and floating-point types
float WW3D::FractionalSyncMs = 0.0f;
unsigned int WW3D::SyncTime = 0;
unsigned int WW3D::PreviousSyncTime = 0;
Expand Down Expand Up @@ -1373,7 +1373,7 @@
SurfaceClass::SurfaceDescription surfaceDesc;
surface->Get_Description(surfaceDesc);

SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (DX8Wrapper::_Create_DX8_Surface(surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format)));
SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format));
DX8Wrapper::_Copy_DX8_Rects(surface->Peek_D3D_Surface(), nullptr, 0, surfaceCopy->Peek_D3D_Surface(), nullptr);

surface->Release_Ref();
Expand Down Expand Up @@ -1723,7 +1723,7 @@
SurfaceClass::SurfaceDescription surfaceDesc;
surface->Get_Description(surfaceDesc);

SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (DX8Wrapper::_Create_DX8_Surface(surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format)));
SurfaceClass* surfaceCopy = NEW_REF(SurfaceClass, (surfaceDesc.Width, surfaceDesc.Height, surfaceDesc.Format));
DX8Wrapper::_Copy_DX8_Rects(surface->Peek_D3D_Surface(), nullptr, 0, surfaceCopy->Peek_D3D_Surface(), nullptr);

surface->Release_Ref();
Expand Down
Loading