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.

Sign up for GitHub

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

Jump to bottom

Implement ImportAssets/ImportAssets2 #16420

Merged

Dinnerbone merged 18 commits into ruffle-rs:master from wsxarcher:imports2

Jul 2, 2024

Contributor

wsxarcher commented May 22, 2024

Load the ImportAssets(2) url async and copy the character requested.
This does not cover all cases because it requires extensive time of reversing the behavior of Flash but it fixes at least 2 real games I tested.

#15017 (needs to set the HTTP referral if run on desktop, works perfectly as extension)
#10305

danielhjacobs added the waiting-on-review label

wsxarcher force-pushed the imports2 branch 2 times, most recently from 80b26bc to e92933a Compare

May 25, 2024 00:02

kmeisthax reviewed

View reviewed changes

Member

kmeisthax left a comment

What you have so far largely feels correct, though I absolutely do think this needs some test cases, if only to rule out some of the speculation I put in the comments.

core/src/library.rs Outdated Show resolved Hide resolved

core/src/library.rs Outdated Show resolved Hide resolved

core/src/loader.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Show resolved Hide resolved

Contributor Author

wsxarcher commented May 25, 2024

What you have so far largely feels correct, though I absolutely do think this needs some test cases, if only to rule out some of the speculation I put in the comments.

Testing can be tricky because of the async nature of the loading. I think flash locks the all vm to load something but in our case we cannot do it. So it works on these games because the loading is in the menu but if you make an artificial swf you need to put some arbitrary sleep and I'm not sure how to do it

Dinnerbone requested changes

View reviewed changes

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Show resolved Hide resolved

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Show resolved Hide resolved

Lord-McSweeney reviewed

View reviewed changes

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

adrian17 reviewed

View reviewed changes

core/src/loader.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

wsxarcher force-pushed the imports2 branch from 0a2e48d to ae88834 Compare

June 26, 2024 18:06

wsxarcher requested a review from Dinnerbone

June 27, 2024 10:15

Dinnerbone reviewed

View reviewed changes

core/src/loader.rs Outdated Show resolved Hide resolved

Dinnerbone reviewed

View reviewed changes

Contributor

Dinnerbone left a comment

One minor nit from me otherwise looks good, I'd like to get this in and then I want to work on a followup soon for testing + more edge cases

Dinnerbone approved these changes

View reviewed changes

Lord-McSweeney reviewed

View reviewed changes

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

Lord-McSweeney reviewed

View reviewed changes

core/src/loader.rs Outdated Show resolved Hide resolved

Lord-McSweeney reviewed

View reviewed changes

core/src/avm1/property_map.rs Outdated Show resolved Hide resolved

Lord-McSweeney reviewed

View reviewed changes

core/src/display_object/movie_clip.rs Outdated Show resolved Hide resolved

Dinnerbone force-pushed the imports2 branch from 78077a1 to 774c598 Compare

July 2, 2024 11:13

wsxarcher added 12 commits

July 2, 2024 13:27


          Imports wip

2fd17f5

fix

d3ba00b


          load something

7cc0ee0


          load in correct id

0b37285


          now can shoot


          simplify

c55af2c

fmt

b9364cd


          make exported assets (parent) accessible from imported (child)

e2604e4


          fix merge

5497f0e


          clean

d710aa1


          clean2

ce2dd50


          fix clippy

4c05e18

wsxarcher added 6 commits

July 2, 2024 13:27


          fix upstream

1cdfc42


          remove debug logs

f8adb14


          set as debug

9b879fd


          do not copy wait and remove useless loaderinfo

6dc3dc7


          remove unused


          fixes

27da776

torokati44 force-pushed the imports2 branch from 774c598 to 27da776 Compare

July 2, 2024 11:27

Dinnerbone enabled auto-merge (squash)

July 2, 2024 11:29

Dinnerbone merged commit fe08638 into ruffle-rs:master

17 checks passed

sleepycatcoding removed the waiting-on-review label

n0samu mentioned this pull request

web: Ruffle does not load the shared_assets.swf #2365

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet