Repository navigation
fix(backend): a game's Retina in every prefix, and a stale launch wrapper replaced - #819
Merged
Merged
Conversation
…pper replaced A game's own Retina setting reached only a bottle (bottles/<id>). A Windows program runs in Steam's prefix, so the setting it shows in Game settings was ignored there; and when another game in that prefix did change it, it stayed for every Steam game after it until Steam's next start. Each launch now sets the game's own Retina, or Settings > Graphics', in whatever prefix it starts in, and only when user.reg does not hold it already. The Wine launch wrapper in cache/ was written once and, when an earlier MetalSharp's wrapper was there instead, refused: a game's window mode and resolution were then dropped until MetalSharp was reinstalled. It is now replaced atomically with this MetalSharp's. Follow-up to #811.
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
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.
Summary
Follow-up to #811, for the reporter's latest comment. #812 fixed the FEX switch itself. The reporter then described games in the Sharp Library that didn't pick up Retina, "stuck on Wine virtual display", capped at 60 FPS on D3DMetal and Mullion. It happened per game, and reinstalling fixed it. I found two bugs that match: one breaks per-game Retina, the other only clears with a reinstall.
bottles/<id>prefixes.user.regdoesn't already hold it.cache/metalsharp-wine-game-launcher) went stale.O_EXCL. If an earlier MetalSharp's wrapper was there instead, it was refused and launches went without it.cache/.On the other point in that comment: the same failure going the other way (FEX first, then switching to x86_64) is also covered by #812.
ms_wine_x86_64_app_source()reads the app version through the samepopen/pclose, and the reaper that broke it is gone.Changes
game_tuning.c:apply_bottle_retinais nowapply_prefix_retinaand applies to any prefix. The "a prefix Wine hasn't made starts with Retina off" shortcut is kept.steam_actions.c:ms_steam_wine_launch_wrapper_pathkeeps a matching wrapper. Otherwise it writes to a temporary file and renames it over the old one.game_tuning_test.c, using a fakewinethat logs the import:prefix-steamuser.regholds itruntime_routes_test.c: a wrapper from an earlier MetalSharp is replaced, keeps the same path, and stays executable.PR Readiness (MANDATORY)
/Users/...paths introducedTest notes
game_tuning_test: builds on Linux and passes forVARIANT=regularandVARIANT=fex. The new Retina test fails on unchangedmainat the first import assertion.runtime_routes_testand the fullmake -C app/src-c test, which build only on macOS.git clang-format --diffis clean.Risk
wine reg importin Steam's prefix: only when the game's Retina differs from what the prefix holds.Generated by Claude Code