Skip to content

[pull] master from beyond-all-reason:master #62

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 11, 2026
Merged

[pull] master from beyond-all-reason:master #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83bf625
Windows: undefine the MemoryBarrier macro
gajop Aug 11, 2026
d128390
unitsync: release Lua memory pool on shutdown
gajop Aug 11, 2026
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
1 change: 1 addition & 0 deletions rts/System/Platform/Win/win32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#undef DeleteFile
#undef SendMessage
#undef GetCharWidth
#undef MemoryBarrier
#undef far
#undef near
#undef FAR
Expand Down
8 changes: 8 additions & 0 deletions test/unitsync/testUnitSync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,12 @@ TEST_CASE("UnitSync")
if ((errmsg = us::GetNextError()) == nullptr) {
FAIL_CHECK("No error on GetWritableDataDirectory before init"); // there's an error cause we called GetWritableDataDirectory() after UnInit()!
}

// Exercise repeated initialization and shutdown.
for (int cycle = 0; cycle < 2; ++cycle) {
CHECK(us::Init(false, 0) != 0);
CHECK_ERROR_MESSAGE(errmsg);
us::UnInit();
CHECK_ERROR_MESSAGE(errmsg);
}
}
3 changes: 2 additions & 1 deletion tools/unitsync/unitsync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// shared with spring:
#include "lib/lua/include/LuaInclude.h"
#include "Game/GameVersion.h"
#include "Lua/LuaMemPool.h"
#include "Lua/LuaParser.h"
#include "Map/MapParser.h"
#include "Map/ReadMap.h"
Expand Down Expand Up @@ -421,6 +422,7 @@ EXPORT(void) UnInit()
try {
_Cleanup();
FileSystemInitializer::Cleanup();
LuaMemPool::KillStatic();
ConfigHandler::Deallocate();
DataDirLocater::FreeInstance();
}
Expand Down Expand Up @@ -2371,4 +2373,3 @@ EXPORT(const char*) GetMacAddrHash() {
memcpy(macAddrBuf.data(), macAddrHash.data(), std::min(macAddrHash.size(), macAddrBuf.size()));
return (macAddrBuf.data());
}