-
-
Notifications
You must be signed in to change notification settings - Fork 958
avm1: Fix prototype chain for movies loaded into levels #22688
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.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
12 changes: 12 additions & 0 deletions
12
tests/tests/swfs/avm1/loadmovienum_cross_version_prototype/Target.as
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // Compile with: | ||
| // mtasc -main -header 200:150:30 -version 8 Target.as -swf target.swf | ||
|
|
||
| class Target { | ||
| static function main(current) { | ||
| current.runProtoTest = function() { | ||
| MovieClip.prototype.customProp = "FROM_SWF8"; | ||
| trace("Target (SWF8): _level2.customProp = " + _level2.customProp); | ||
| trace("Target (SWF8): _level2.__proto__ === MovieClip.prototype: " + (_level2.__proto__ === MovieClip.prototype)); | ||
| }; | ||
| } | ||
| } |
49 changes: 49 additions & 0 deletions
49
tests/tests/swfs/avm1/loadmovienum_cross_version_prototype/Test.as
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Compile with: | ||
| // mtasc -main -header 200:150:30 -version 6 Test.as -swf test.swf | ||
|
|
||
| class Test { | ||
| static var checkCount = 0; | ||
| static var phase = 0; | ||
|
|
||
| static function main(current) { | ||
| trace("Test (SWF6): Loading target.swf into _level2"); | ||
| getURL("target.swf", "_level2"); | ||
|
|
||
| current.onEnterFrame = function() { | ||
| Test.checkCount++; | ||
|
|
||
| if (Test.phase == 0) { | ||
| // Phase 0: Wait for load and test prototype | ||
| if (_level2 != undefined && _level2._url != undefined && _level2._url.indexOf("target.swf") >= 0) { | ||
| trace("Test (SWF6): _level2.getSWFVersion() = " + _level2.getSWFVersion()); | ||
|
|
||
| MovieClip.prototype.testProp = "FROM_SWF6"; | ||
| trace("Test (SWF6): _level2.testProp = " + _level2.testProp); | ||
| trace("Test (SWF6): _level2.__proto__ === MovieClip.prototype: " + (_level2.__proto__ === MovieClip.prototype)); | ||
|
|
||
| if (_level2.runProtoTest != undefined) { | ||
| _level2.runProtoTest(); | ||
| } | ||
|
|
||
| // Now test unload behavior | ||
| trace("Test (SWF6): Unloading _level2"); | ||
| getURL("", "_level2"); | ||
| Test.phase = 1; | ||
| Test.checkCount = 0; | ||
| } else if (Test.checkCount > 60) { | ||
| trace("Test (SWF6): Timeout"); | ||
| delete current.onEnterFrame; | ||
| } | ||
| } else if (Test.phase == 1) { | ||
| // Phase 1: Check state after unload (wait a couple frames) | ||
| if (Test.checkCount >= 2) { | ||
| trace("Test (SWF6): After unload - _level2.__proto__ === MovieClip.prototype: " + (_level2.__proto__ === MovieClip.prototype)); | ||
| // The prototype should still be SWF8's, not SWF6's, because the unloaded | ||
| // stub keeps the loaded movie's version | ||
| trace("Test (SWF6): After unload - _level2.testProp = " + _level2.testProp); | ||
| delete current.onEnterFrame; | ||
| } | ||
| } | ||
| }; | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
tests/tests/swfs/avm1/loadmovienum_cross_version_prototype/output.txt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| Test (SWF6): Loading target.swf into _level2 | ||
| Test (SWF6): _level2.getSWFVersion() = 8 | ||
| Test (SWF6): _level2.testProp = | ||
| Test (SWF6): _level2.__proto__ === MovieClip.prototype: false | ||
| Target (SWF8): _level2.customProp = FROM_SWF8 | ||
| Target (SWF8): _level2.__proto__ === MovieClip.prototype: true | ||
| Test (SWF6): Unloading _level2 | ||
| Test (SWF6): After unload - _level2.__proto__ === MovieClip.prototype: false | ||
| Test (SWF6): After unload - _level2.testProp = |
Binary file added
BIN
+379 Bytes
tests/tests/swfs/avm1/loadmovienum_cross_version_prototype/target.swf
Binary file not shown.
Binary file added
BIN
+672 Bytes
tests/tests/swfs/avm1/loadmovienum_cross_version_prototype/test.swf
Binary file not shown.
1 change: 1 addition & 0 deletions
1
tests/tests/swfs/avm1/loadmovienum_cross_version_prototype/test.toml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| num_frames = 6 |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.