Skip to content

Conversation

moulins
Copy link
Contributor

@moulins moulins commented Oct 16, 2025

Fixes #21703.

Supersedes #21725, with a more correct approach.

Movies loaded through ImportAssets(2) should not be accessible via AVM1 bytecode (in particular, they don't have an associated AVM1Object); this is enforced by executing any DoInitAction block encountered during preload as if it was in the parent importer movie.

@moulins moulins force-pushed the import-assets-do-init-action branch from 82f0840 to 343fc78 Compare October 16, 2025 20:49
@moulins moulins added A-avm1 Area: AVM1 (ActionScript 1 & 2) T-fix Type: Bug fix (in something that's supposed to work already) labels Oct 16, 2025
@moulins moulins force-pushed the import-assets-do-init-action branch from 343fc78 to de23bae Compare October 16, 2025 20:56
@moulins moulins added the waiting-on-review Waiting on review from a Ruffle team member label Oct 16, 2025
@danielhjacobs
Copy link
Contributor

If this supersedes #21725, I assume it also fixes #21901?

@Dinnerbone
Copy link
Contributor

Does not fix gnash tests :(

# Tests DoInitAction behavior in child movies, both when
# loaded through a `MovieClipLoader` and through `ImportAssets2`.
#
# .swf files where handcrafted using the JPEXS Decompiler and have
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: where -> were

…SwfMovie>`.

This will be needed for executing `DoInitAction` blocks in movies loaded through
`ImportAssets` in the correct context.
@Dinnerbone Dinnerbone enabled auto-merge (rebase) October 17, 2025 18:30
@Dinnerbone Dinnerbone force-pushed the import-assets-do-init-action branch from de23bae to d173961 Compare October 17, 2025 18:30
@Dinnerbone Dinnerbone merged commit 67edb2e into ruffle-rs:master Oct 17, 2025
26 checks passed
@moulins moulins deleted the import-assets-do-init-action branch October 17, 2025 18:54
@moulins
Copy link
Contributor Author

moulins commented Oct 17, 2025

If this supersedes 21725, I assume it also fixes 21901?

It does, yes.

@danielhjacobs danielhjacobs linked an issue Oct 17, 2025 that may be closed by this pull request
@Lord-McSweeney Lord-McSweeney removed the waiting-on-review Waiting on review from a Ruffle team member label Oct 17, 2025
Hancock33 added a commit to Hancock33/batocera.piboy that referenced this pull request Oct 19, 2025
----------------------------------------------------------------------------------
clk.mk ad162a4e4a644e28ee630a70e6f65172301633ca # Version: Commits on Oct 18, 2025
----------------------------------------------------------------------------------
Merge pull request #1607 from TomHarte/MacAudio

Correct Mac audio buffering,

------------------------------------------------------------------------------------------
dolphin-emu.mk 7b994d965432687e194c87b347e584ddda08bfae # Version: Commits on Oct 17, 2025
------------------------------------------------------------------------------------------
Merge pull request #14019 from JosJuice/android-ndk-29

Android: Update NDK version to 29.0.14206865,

-----------------------------------------------------------------------------------
eden.mk d24db9c3cb39243cbbeac3f6e7b51a0003fc7064 # Version: Commits on Oct 18, 2025
-----------------------------------------------------------------------------------
[frontend] fix compile error (#2767)

--------------------------------------------------------------------------------------
flycast.mk d1ed878446d6cf579827499b9f057fd1d4c55ac3 # Version: Commits on Oct 17, 2025
--------------------------------------------------------------------------------------
Fetch translations & Recreate libretro_core_options_intl.h,

----------------------------------------------------
pcsx2.mk v2.5.233 # Version: Commits on Oct 18, 2025
----------------------------------------------------
- [FSUI: Allow specifying default button in message dialogs](PCSX2/pcsx2#13402)

------------------------------------------------------------------------------------
rpcs3.mk c4fba680d12fa5db77cb868b8ce71e659a0dacdc # Version: Commits on Oct 17, 2025
------------------------------------------------------------------------------------
vk: Fix broken bound object comparison,

--------------------------------------------------------------------------------------
tsugaru.mk 033dbae8aaf247293ef68dc98993c2f6604a0ee9 # Version: Commits on Oct 17, 2025
--------------------------------------------------------------------------------------
Last change was too much.  Reverted, and added a comment.,

-------------------------------------------------------------------------------------------
xenia-native.mk 38ad9bf34216c630f9847b026e99908ab3f883f3 # Version: Commits on Oct 16, 2025
-------------------------------------------------------------------------------------------
[Kernel] Fixed NtYieldExecution

Fixed Ninja Gaiden 3 stuck exiting challenge trials,

-------------------------------------------------------------------------------------
ikemen.mk 67b39354a184788a02f2c1c82e31478b6979e239 # Version: Commits on Oct 18, 2025
-------------------------------------------------------------------------------------
Merge pull request #2799 from Eiton/Fix

fix: Fix font rendering artifact,

---------------------------------------------------------------
ruffle.mk nightly-2025-10-18 # Version: Commits on Oct 18, 2025
---------------------------------------------------------------
## What's Changed

* avm2: Cover special cases in Number.toExponential by @kjarosh in ruffle-rs/ruffle#21934

* chore: Bump `wasm-bindgen` to `0.2.104`, ...`-futures` to `0.4.54`, and `js-sys` and `web-sys` to `0.3.81` by @torokati44 in ruffle-rs/ruffle#21949

* nit: Update mentioned Ubuntu version in instructions for AMO reviewers by @torokati44 in ruffle-rs/ruffle#21951

* chore: Bump Binaryen (wasm-opt) to 124 by @torokati44 in ruffle-rs/ruffle#21952

* chore: Migrate from Node.js 22 to 24 by @torokati44 in ruffle-rs/ruffle#21950

* core/avm1: Execute `DoInitAction`s in movies loaded through `ImportAssets` with the proper context. by @moulins in ruffle-rs/ruffle#21944

* core: Rename `TDisplayObject::object` to `TDisplayObject::object1` by @Lord-McSweeney in ruffle-rs/ruffle#21955

* core: Pause preloading until an ImportAssets is finished, + test by @Dinnerbone in ruffle-rs/ruffle#16968

**Full Changelog**: ruffle-rs/ruffle@nightly-2025-10-17...nightly-2025-10-18,

---------------------------------------------------------------------------------------
corsixth.mk 5c6acc2fe5b2e4312b4d3e955dbceff9290bbf69 # Version: Commits on Oct 18, 2025
---------------------------------------------------------------------------------------
fix hover sfx not playing when sound is muted (#3075),

----------------------------------------------------------------------------------------
openmohaa.mk cbb43b702e9d51609fc2a4907cdd572f851eda9c # Version: Commits on Oct 17, 2025
----------------------------------------------------------------------------------------
Use FS_CreatePath in Sys_ErrorDialog,

-----------------------------------------------------------------------------------------------
mupen64plus-core.mk e0afbb2c2f67377c9d47bc4e3a9bee47b6ea54c9 # Version: Commits on Oct 17, 2025
-----------------------------------------------------------------------------------------------
Add widescreen hacks for Kirby 64 and Ridge Racer 64 to mupen64plus.ini (#1157),

----------------------------------------------------------------------------------------
doomretro.mk f75718b35a4fa443f23a44c15ab554c40d24c4c3 # Version: Commits on Oct 18, 2025
----------------------------------------------------------------------------------------
Make times shown in console consistent with times on intermission screen,

-------------------------------------------------------------------------------------
gzdoom.mk c9a723e37dfdd5f8ab9702ef127dd7424b5dc093 # Version: Commits on Oct 18, 2025
-------------------------------------------------------------------------------------
- only allow numerical values for `steamappid` and `discordappid`,

-----------------------------------------------------------------------------------------------
libretro-flycast.mk d1ed878446d6cf579827499b9f057fd1d4c55ac3 # Version: Commits on Oct 17, 2025
-----------------------------------------------------------------------------------------------
Fetch translations & Recreate libretro_core_options_intl.h,

-----------------------------------------------------------------------------------------------
libretro-sameboy.mk 4c57a761517d3d11bb8d2ce31037b17d3a85b745 # Version: Commits on Oct 17, 2025
-----------------------------------------------------------------------------------------------
Refine and comment CGB-0 PCM12 behavior,

---------------------------------------------------------------------------------------------
libretro-vba-m.mk 704f2f19db20601c1fd3596cfb9d4d4db59f729f # Version: Commits on Oct 17, 2025
---------------------------------------------------------------------------------------------
build: turn off tests for openssl for Mac builder

Signed-off-by: Rafael Kitover <[email protected]>,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-avm1 Area: AVM1 (ActionScript 1 & 2) newsworthy T-fix Type: Bug fix (in something that's supposed to work already)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

regression since nightly 2025-09-17 Error on http://www.mygamesworld.com/game/7279/Cubis_2_-_Morph-Fun.html

5 participants