Fix macos bugs with Warcraft II installer extraction - #781
Open
TomAnthony wants to merge 5 commits into
Open
Conversation
runCommand() passed the caller-supplied argv straight to execvp(), but execvp uses argv[0] as the program-name slot and starts option parsing at argv[1]. To match the Windows overload, callers pass only the arguments (no program name), so the first real argument was silently swallowed: `innoextract -i <file>` ran as `innoextract <file>`, turning a harmless info probe into a full extraction. Prepend the program name to the child argv so all caller-supplied arguments survive. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
argv[2] was set to tmpp.string().c_str(), but tmpp.string() returns a temporary std::string that is destroyed at the end of the statement, leaving argv[2] dangling. With a long (heap-allocated) temp path this is a genuine use-after-free, so innoextract intermittently received a garbage -d argument and the extraction failed. Hold the path in a local string for the duration of the runCommand() call. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
On macOS extractor_tool is used as a filesystem path: fs::path(...) when locating the bundled scripts/contrib directories and when building the osascript extraction command. The quote characters baked in for the POSIX shell made those paths invalid, so extraction aborted with a "could not discover scripts path" error -- and because that message contains a quote, tinyfiledialogs replaced it with "INVALID MESSAGE WITH QUOTES", hiding the real cause. Only quote on the non-macOS POSIX path, which concatenates the extractor directly into a shell command. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
The contrib copy (scripts, UI graphics, shaders, ...) was skipped whenever force == 2. That value is used both by the "extract more" expansion recursion -- which must not re-copy, since copy_dir() wipes its target before copying and the expansion pass does not re-extract the base data -- and by a data file passed on the command line. The latter can be a first extraction, which still needs the contrib dirs or the engine cannot start (it fails to load e.g. scripts/stratagus.lua and the UI graphics). Distinguish the two cases by datafileCstr: the expansion recursion passes none. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
A Finder-launched app inherits the minimal launchd PATH, which excludes Homebrew and MacPorts, so a bare "innoextract" was not found even when it was installed and the user could only extract from a terminal. Resolve it explicitly: next to our own executable (so it can be bundled in future), then the common package-manager locations, finally falling back to a bare name so execvp still searches PATH when run from a shell. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Jarod42
approved these changes
Jun 28, 2026
Jarod42
left a comment
Jarod42
left a comment
Member
There was a problem hiding this comment.
Look good to be.
Untested though.
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
2 participants
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.
This is a bunch of fixes for getting Wargus running on macos, including:
In case it matters: Claude did the actual code work, with me driving and testing.
Wargus now launches direct from the GUI, where you can select an .exe installation file and it correctly extracts and launches. Tested on macos 26 on ARM.
I haven't got access to Windows, but I think the changes should be safe there but should be tested.