sync: TheSuperHackers upstream (5 commits, 06-04-2026)

[fbraz3]

Description

Syncs 5 commits from TheSuperHackers/main (7c78a5e17) into the
thesuperhackers-sync-06-04-2026 branch. Last local sync ancestor
was 20f42549c.

This is a small, well-scoped sync. The bulk of the upstream
file-unification work (into Core/) was absorbed by previous syncs;
this sync is a clean refactor + a couple of bug fixes.

Changes Brought In

• fix(memory): Fix various memory leaks (2) TheSuperHackers/GeneralsGameCode#2710 fix(memory): Fix various memory leaks (2) — defensive
  guards + RAII placement across ~22 files
• bugfix(object): Avoid crash with dangling contain module in Object::onDestroy() when Reinforcement Pad is destroyed before Troop Crawler drop TheSuperHackers/GeneralsGameCode#2747 bugfix(object): Avoid crash in Object::onDestroy with dangling contain module — null check + cached pointer
  (Troop Crawler / Reinforcement Pad scenario)
• fix(milesaudiomanager): Prevent multithread crashing in MilesAudioManager TheSuperHackers/GeneralsGameCode#2718 fix(milesaudiomanager): Prevent multithread crashing + simplify — new MilesAudioManagerDummy, mutex.h use, new
  PS_Stopping state
• fix(metaevent): Ignore order in which modifier keys are released to trigger meta events TheSuperHackers/GeneralsGameCode#2577 fix(metaevent): Ignore order in which modifier keys are released — bundled with the refactor below
• refactor(metaevent): Split MetaEventTranslator::translateGameMessage() into smaller functions TheSuperHackers/GeneralsGameCode#2758 refactor(metaevent): Split MetaEventTranslator::translateGameMessage()
  — new onKeyEvent / onKeyPressed / onKeyModStateRemoved methods,
  KeyDownInfo struct replacing m_lastKeyDown / m_lastModState

Conflict Resolution

2 real UU conflicts (both MetaEvent.cpp):
Resolved by taking upstream's onKeyEvent(msg, disp) dispatch.
The new methods are auto-merged into the file body; the conflict was
only the inline keyboard handling block.

4 broken auto-merge sites — hand-repaired:

• Generals{,MD}/.../MetaEvent.h — git auto-merge unioned upstream's
  new KeyDownInfo struct on top of our old m_lastKeyDown /
  m_lastModState members. Replaced the member block with upstream's
  KeyDownInfo m_keyDownInfos[KEY_COUNT].
• Generals{,MD}/.../MetaEvent.cpp constructors — still initialized
  the now-dead members. Dropped those initializers.

1 downstream API propagation:

• Core/GameEngine/Include/Common/GameAudio.h — base class signatures
  changed: nextMusicTrack / prevMusicTrack now return AsciiString;
  getMusicTrackName removed from abstract base. Our OpenAL backend
  (Core/GameEngineDevice/.../OpenALAudioManager.{h,cpp}) was updated
  to match. The dead stub in GeneralsMD/.../Source/OpenALAudioManager.cpp
  updated for tree parity.

1 build fix required by upstream code:

• Core/Libraries/Include/Lib/BaseType.h — added missing BitsAreSet
  macro that upstream's MetaEvent code depends on. Platform-neutral.

1 housekeeping:

• AGENTS.md — cleared pre-existing merge markers (from commit
  996eedd4e, NOT from this sync). Kept the "Updated upstream" version
  which matches the current file structure.

No blanket strategies — each file was analyzed and resolved
individually.

Cross-Platform Integrity

Full audit performed:

• SDL3 layer: untouched by upstream
• DXVK layer: only a memory-leak fix in W3DModelDraw.cpp (platform-neutral)
• OpenAL layer: updated to match new AudioManager signatures (compile-clean)
• FFmpeg / Video layer: untouched
• Miles Audio: refactored, but only internal state enum and mutex.h
  (cross-platform, uses std::atomic)
• interlocked_adapter.h: VC6-compat shim gated on _MSC_VER < 1300,
  inert on Linux/macOS
• INI parser: untouched (no macOS numeric-parsing risk in this sync)
• All .github/ CI/CD infrastructure: intact, untouched
• GeneralsX-specific patches and GeneralsX @bugfix annotations: preserved

The GeneralsX cross-platform stack (SDL3 + DXVK + OpenAL + FFmpeg)
is fully preserved.

Validation

Step	Status
macos-vulkan configure	Pass (141.5s)
z_generals (GeneralsXZH) build	Pass (15.7 MB)
GeneralsX target build	Pass (14.9 MB)
Runtime smoke — GeneralsXZH	Pass (SDL3/OpenAL/Vulkan/INI init, main loop entered, exit 0)
Runtime smoke — GeneralsX	Pass (same)
No merge markers in tree	Pass (excluding build/ artifacts and third-party FetchContent)
Cross-platform audit	Pass (no platform code leaked into shared headers)
linux64-deploy Docker build	Deferred to CI (per user request — robust CI covers it)

Files / Subsystems Needing Extra Review

• MetaEventTranslator (input/keyboard) — verify KeyDownInfo m_keyDownInfos[KEY_COUNT]
  is sized correctly for the system key count on all platforms
• GameAudio.h base API change — any third-party audio backend added
  later must return AsciiString from music-track methods
• Miles Audio refactor — new MilesAudioManagerDummy; reference-only
  on Linux/macOS but must compile
• W3DModelDraw.cpp — animHandle lifecycle refactor; verify
  long-session W3D animations
• OpenAL stub in GeneralsMD/.../Source/OpenALAudioManager.cpp —
  matches new signatures for tree parity

Testing Checklist

• CI Linux build (linux64-deploy + linux64-testing) must pass
• CI Windows builds (mingw-w64-i686, vc6, win32) must pass
• CI replay tests must not regress
• CMake configure on all supported platforms
• Game launch (both products, macOS + Linux)
• Main menu + keyboard navigation
• Skirmish gameplay (Troop Crawler / Reinforcement Pad scenario from bugfix(object): Avoid crash with dangling contain module in Object::onDestroy() when Reinforcement Pad is destroyed before Troop Crawler drop TheSuperHackers/GeneralsGameCode#2747)
• Campaign save/load
• Audio: music track prev/next buttons
• Video: FFmpeg intro / Bink replays
• Renderer: long-session W3D model animations
• Input: multi-modifier combos with non-strict release order (fix(metaevent): Ignore order in which modifier keys are released to trigger meta events TheSuperHackers/GeneralsGameCode#2577 fix)
• Mod loading
• Manual smoke with full game assets (I only validated the init path)

References

• fix(memory): Fix various memory leaks (2) TheSuperHackers/GeneralsGameCode#2710
• bugfix(object): Avoid crash with dangling contain module in Object::onDestroy() when Reinforcement Pad is destroyed before Troop Crawler drop TheSuperHackers/GeneralsGameCode#2747
• fix(milesaudiomanager): Prevent multithread crashing in MilesAudioManager TheSuperHackers/GeneralsGameCode#2718
• fix(metaevent): Ignore order in which modifier keys are released to trigger meta events TheSuperHackers/GeneralsGameCode#2577
• refactor(metaevent): Split MetaEventTranslator::translateGameMessage() into smaller functions TheSuperHackers/GeneralsGameCode#2758

Full conflict resolution plan and risk analysis:
docs/WORKDIR/planning/PLAN-2026-06-04_THESUPERHACKERS_SYNC.md