[codex] Avoid unsafe GFx movie replacement hangs#7
Open
nwn900 wants to merge 1 commit into
Open
Conversation
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
This patch makes InfinityUI instance replacement safer for GFx movie clips that can fail or stall during patch loading.
loadMoviefails or loaded definitions cannot be resolved, instead of removing the live UI element first.PatchGFxMovieagainst recursive patch passes whenGFxMovieRoot::Advance(0)re-enters the hook during patching.Why
I hit a game hang while playing with InfinityUI patches active. The previous replacement path removed the original movie clip before proving the replacement SWF had loaded successfully, and the
Advance(0)calls used while patching could also re-enter InfinityUI patching for the same movie root. Together that made a bad or slow patch load much more likely to leave the menu in an unstable state.The new default path is fail-closed: load and validate the replacement first, then swap it into place. If validation fails, the original UI element remains alive and InfinityUI logs the skipped replacement.
New Settings
bSafeReplacement:Patchingdefaults totrue.uSlowPatchWarningMS:Patchingdefaults to250; set to0to disable slow patch warnings.sDisabledPatchFiles:Patchingdefaults to empty; accepts comma- or semicolon-separated patch path suffixes to skip.Validation
git diff --checkcmake --build build\se-only\relwithdebinfothrough the Visual Studio developer environmentNote: running the build from a plain PowerShell initially failed because MSVC's standard library include paths were not loaded in that shell. The same build completed successfully after
VsDevCmd.bat -arch=x64initialized the compiler environment.