diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c032c5f5..173d542eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -### Added -- FLA export - accessibility for AS3 files ## [22.0.1] - 2024-11-20 ### Added diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java index c73d493d9..68d25bae7 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java @@ -462,7 +462,7 @@ public class TraitClass extends Trait implements TraitWithSlot { } } - if (convertData.ignoreAccessibility) { + if (convertData.ignoreAccessibility && false /*WIP*/) { if (constructorBody.convertedItems != null) { for (int j = 0; j < constructorBody.convertedItems.size(); j++) { GraphTargetItem ti = constructorBody.convertedItems.get(j); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index 42f9d5160..52d6c7279 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -2826,6 +2826,9 @@ public class XFLConverter { private static Map getRootAccessibilityFromPack(AbcIndexing abcIndex, ScriptPack pack) { + if (true) { //WIP + return new HashMap<>(); + } int swfVersion = -1; if (pack.getOpenable() instanceof SWF) { swfVersion = ((SWF) pack.getOpenable()).version; @@ -2911,6 +2914,9 @@ public class XFLConverter { private static Map> getAccessibilityFromPack(AbcIndexing abcIndex, ScriptPack pack) { + if (true) { //WIP + return new HashMap<>(); + } int swfVersion = -1; if (pack.getOpenable() instanceof SWF) { swfVersion = ((SWF) pack.getOpenable()).version; diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility.html b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility.html new file mode 100644 index 000000000..e9fe25df5 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility.html @@ -0,0 +1,49 @@ + + + + as2_accessibility + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + Get Adobe Flash player + + + + + +
+ + diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility.swf b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility.swf new file mode 100644 index 000000000..b548563c6 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility.swf differ diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/DOMDocument.xml b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/DOMDocument.xml new file mode 100644 index 000000000..7ca5a3fa5 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/DOMDocument.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + abc + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/LIBRARY/Symbol 1.xml b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/LIBRARY/Symbol 1.xml new file mode 100644 index 000000000..91dc37603 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/LIBRARY/Symbol 1.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/LIBRARY/Symbol 2.xml b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/LIBRARY/Symbol 2.xml new file mode 100644 index 000000000..3b3f1434a --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/LIBRARY/Symbol 2.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/META-INF/metadata.xml new file mode 100644 index 000000000..9d71c3321 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/META-INF/metadata.xml @@ -0,0 +1,74 @@ + + + + + Adobe Flash Professional CS6 - build 481 + 2024-11-23T07:36:32-08:00 + 2024-11-23T13:47:11-08:00 + 2024-11-23T13:47:11-08:00 + + + application/vnd.adobe.fla + + + xmp.iid:D9E6AFFBB0A9EF11A208DFE3564218EE + xmp.did:D9E6AFFBB0A9EF11A208DFE3564218EE + xmp.did:18E9B4E75B9FEF11A208DFE3564218EE + + + + created + xmp.iid:18E9B4E75B9FEF11A208DFE3564218EE + 2024-11-23T07:36:32-08:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:D1E6AFFBB0A9EF11A208DFE3564218EE + 2024-11-23T07:36:32-08:00 + Adobe Flash Professional CS6 - build 481 + + + saved + xmp.iid:D9E6AFFBB0A9EF11A208DFE3564218EE + 2024-11-23T13:47:11-08:00 + Adobe Flash Professional CS6 - build 481 + / + + + + + xmp.iid:D1E6AFFBB0A9EF11A208DFE3564218EE + xmp.did:18E9B4E75B9FEF11A208DFE3564218EE + xmp.did:18E9B4E75B9FEF11A208DFE3564218EE + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/MobileSettings.xml b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/MobileSettings.xml new file mode 100644 index 000000000..e69de29bb diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/PublishSettings.xml b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/PublishSettings.xml new file mode 100644 index 000000000..4ec150a87 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/PublishSettings.xml @@ -0,0 +1,206 @@ + + + + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + as2_accessibility.swf + as2_accessibility.exe + as2_accessibility.app + as2_accessibility.html + as2_accessibility.gif + as2_accessibility.jpg + as2_accessibility.png + as2_accessibility.mov + as2_accessibility.smil + as2_accessibility.swc + + + 0 + 12,0,0,0;11,2,0,0;11,1,0,0;10,3,0,0;10,2,153,0;10,1,52,0;9,0,124,0;8,0,24,0;7,0,14,0;6,0,79,0;5,0,58,0;4,0,32,0;3,0,8,0;2,0,1,12;1,0,0,1; + 1 + 1 + as2_accessibility.xfl_content.html + as2_accessibility.xfl_alternate.html + 0 + + 550 + 400 + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 4 + 0 + 0 + 1 + 0 + C:\Users\MyUser\AppData\Local\Adobe\Flash CS6\en_US\Configuration\HTML\Default.html + 1 + + + + + 0 + 0 + 0 + 80 + 0 + 0 + 7 + 0 + 7 + 0 + 15 + FlashPlayer11.2 + 2 + 1 + + . + CONFIG::FLASH_AUTHORING="true"; + 0 + + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + 2 + 4 + 4096 + AS3 + 1 + 1 + 0 + 15 + 1 + 0 + 4102 + rsl + wrap + $(AppConfig)/ActionScript 3.0/rsls/loader_animation.swf + + + $(AppConfig)/ActionScript 3.0/libs + merge + + + $(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc + rsl + http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz + http://fpdownload.adobe.com/pub/swz/crossdomain.xml + textLayout_2.0.0.232.swz + + + + + $(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc + + http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz + http://fpdownload.adobe.com/pub/swz/crossdomain.xml + textLayout_2.0.0.232.swz + + + + + 550 + 400 + 0 + 4718592 + 0 + 80 + 1 + + + 1 + 0 + 1 + 0 + 0 + 100000 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + + 550 + 400 + 0 + 1 + 1 + + 1 + 0 + 1 + 0 + 0 + + 128 + + + 255 + + + + 550 + 400 + 1 + 0 + 0 + 1 + 0 + 0 + 1 + + + + 24-bit with Alpha + 255 + + + + 550 + 400 + 1 + 0 + + + 00000000 + 0 + 0 + 0 + 0 + 1 + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/as2_accessibility.xfl b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/as2_accessibility.xfl new file mode 100644 index 000000000..860a820ec --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/as2_accessibility.xfl @@ -0,0 +1 @@ +PROXY-CS5 \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/bin/SymDepend.cache new file mode 100644 index 000000000..79c6bfb92 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2_accessibility/as2_accessibility/bin/SymDepend.cache differ diff --git a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility.swf b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility.swf index 92b76589e..d55432004 100644 Binary files a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility.swf and b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility.swf differ diff --git a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/DOMDocument.xml b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/DOMDocument.xml index 2082f6718..4cef93515 100644 --- a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/DOMDocument.xml +++ b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/DOMDocument.xml @@ -4,11 +4,14 @@ - + - + + + + @@ -18,7 +21,7 @@ - + diff --git a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/META-INF/metadata.xml index f331a5453..281f854ba 100644 --- a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/META-INF/metadata.xml +++ b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/META-INF/metadata.xml @@ -5,8 +5,8 @@ xmlns:xmp="http://ns.adobe.com/xap/1.0/"> Adobe Flash Professional CS6 - build 481 2024-11-23T07:36:32-08:00 - 2024-11-23T07:40:19-08:00 - 2024-11-23T07:40:19-08:00 + 2024-11-23T13:53:10-08:00 + 2024-11-23T13:53:10-08:00 @@ -15,7 +15,7 @@ - xmp.iid:D1E6AFFBB0A9EF11A208DFE3564218EE + xmp.iid:2E5EAF21E5A9EF11A208DFE3564218EE xmp.did:18E9B4E75B9FEF11A208DFE3564218EE xmp.did:18E9B4E75B9FEF11A208DFE3564218EE @@ -32,6 +32,12 @@ 2024-11-23T07:36:32-08:00 Adobe Flash Professional CS6 - build 481 + + created + xmp.iid:2E5EAF21E5A9EF11A208DFE3564218EE + 2024-11-23T07:36:32-08:00 + Adobe Flash Professional CS6 - build 481 + diff --git a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/bin/SymDepend.cache index dce557df6..d72497e24 100644 Binary files a/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/bin/SymDepend.cache and b/libsrc/ffdec_lib/testdata/as3_accessibility/as3_accessibility/bin/SymDepend.cache differ