Skip to content

fix: Wrong usage of sizeof(this) in BitFlags::xfer(), W3DMPO::glueEnforcer() #1947

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

Merged
xezon merged 5 commits into from
Dec 7, 2025
Merged

fix: Wrong usage of sizeof(this) in BitFlags::xfer(), W3DMPO::glueEnforcer() #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c564fa9
bugfix: fix sizeof(this) in W3DMPO_GLUE macro
bobtista Dec 5, 2025
68a637b
bugfix: fix sizeof(this) in BitFlags CRC calculation
bobtista Dec 5, 2025
04ebb42
compat: add RETAIL_COMPATIBLE_CRC flag for BitFlags sizeof fix
bobtista Dec 5, 2025
0e6a476
refactor: use RETAIL_COMPATIBLE_XFER_SAVE flag and change glueEnforce…
bobtista Dec 6, 2025
0a0c27a
use RETAIL_COMPATIBLE_CRC
bobtista Dec 6, 2025
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
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWLib/always.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ private: \
return The##ARGCLASS##Pool; \
} \
protected: \
virtual int glueEnforcer() const { return sizeof(this); } \
virtual void glueEnforcer() const { } \
public: \
inline void* operator new(size_t s) { return allocateFromW3DMemPool(getClassMemoryPool(), s); } \
inline void operator delete(void *p) { freeFromW3DMemPool(getClassMemoryPool(), p); } \
Expand All @@ -162,7 +162,7 @@ class W3DMPO
}
protected:
// we never call this; it is present to cause compile errors in descendent classes
virtual int glueEnforcer() const = 0;
virtual void glueEnforcer() const = 0;
public:
virtual ~W3DMPO() { /* nothing */ }
};
Expand Down
4 changes: 4 additions & 0 deletions Generals/Code/GameEngine/Include/Common/BitFlagsIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,11 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
{

// just call the xfer implementation on the data values
#if RETAIL_COMPATIBLE_CRC
xfer->xferUser( this, sizeof( this ) );
#else
xfer->xferUser( this, sizeof( *this ) );
#endif

}
else
Expand Down
4 changes: 4 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,11 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
{

// just call the xfer implementation on the data values
#if RETAIL_COMPATIBLE_CRC
xfer->xferUser( this, sizeof( this ) );
#else
xfer->xferUser( this, sizeof( *this ) );
#endif

}
else
Expand Down
Loading