diff --git a/CHANGELOG.md b/CHANGELOG.md index 538de279e..981c826a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ All notable changes to this project will be documented in this file. - Do not display fonts added to stage (for example in testdata/as2.swf, the vertical text - sprite 10) - AS2 Class detection - TemporaryRegisterMark handling - FLA export scripts location +- FLA export shape tweens (morphshapes) ### Changed - AS1/2/3 P-code - format Number values with EcmaScript toString function 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 94ac660b0..cea91c78b 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 @@ -280,7 +280,7 @@ public class XFLConverter { } } - private static void convertShapeEdges(double startX, double startY, MATRIX mat, List recordsAdvanced, StringBuilder ret) { + private static void convertShapeEdges(boolean close, double startX, double startY, MATRIX mat, List recordsAdvanced, StringBuilder ret) { double x = startX; double y = startY; @@ -296,11 +296,26 @@ public class XFLConverter { if (!hasMove) { ret.append("! ").append(formatEdgeDouble(startX, false)).append(" ").append(formatEdgeDouble(startY, false)); } + double lastMoveToX = startX; + double lastMoveToY = startY; + for (ShapeRecordAdvanced rec : recordsAdvanced) { + if (rec instanceof StyleChangeRecordAdvanced) { + StyleChangeRecordAdvanced scr = (StyleChangeRecordAdvanced)rec; + if (scr.stateMoveTo) { + lastMoveToX = scr.moveDeltaX; + lastMoveToY = scr.moveDeltaY; + } + } convertShapeEdge(mat, rec, x, y, ret); x = rec.changeX(x); y = rec.changeY(y); } + //hack for morphshapes. TODO: make this better + if (close && (Double.compare(lastMoveToX, x) != 0 || Double.compare(lastMoveToY, y) != 0)) { + StraightEdgeRecordAdvanced ser = new StraightEdgeRecordAdvanced(lastMoveToX - x, lastMoveToY - y); + convertShapeEdge(mat, ser, x, y, ret); + } } private static String getScaleMode(ILINESTYLE lineStyle) { @@ -821,7 +836,7 @@ public class XFLConverter { currentLayer.writeAttribute("strokeStyle", strokeStyle); } StringBuilder edgesSb = new StringBuilder(); - convertShapeEdges(startEdgeX, startEdgeY, mat, edges, edgesSb); + convertShapeEdges(((fillStyle0 > 0 || fillStyle1 > 0) && morphshape), startEdgeX, startEdgeY, mat, edges, edgesSb); currentLayer.writeAttribute("edges", edgesSb.toString()); currentLayer.writeEndElement(); hasEdge = true; @@ -908,7 +923,7 @@ public class XFLConverter { currentLayer.writeAttribute("strokeStyle", lastStrokeStyle); } StringBuilder edgesSb = new StringBuilder(); - convertShapeEdges(startEdgeX, startEdgeY, mat, edges, edgesSb); + convertShapeEdges(((lastFillStyle0 > 0 || lastFillStyle1 > 0) && morphshape), startEdgeX, startEdgeY, mat, edges, edgesSb); currentLayer.writeAttribute("edges", edgesSb.toString()); currentLayer.writeEndElement(); hasEdge = true; @@ -936,7 +951,7 @@ public class XFLConverter { currentLayer.writeAttribute("strokeStyle", strokeStyle); } StringBuilder edgesSb = new StringBuilder(); - convertShapeEdges(startEdgeX, startEdgeY, mat, edges, edgesSb); + convertShapeEdges(((fillStyle0 > 0 || fillStyle1 > 0) && morphshape), startEdgeX, startEdgeY, mat, edges, edgesSb); currentLayer.writeAttribute("edges", edgesSb.toString()); currentLayer.writeEndElement(); hasEdge = true; @@ -959,7 +974,7 @@ public class XFLConverter { } /** - * A hack. This will remove a stroked path with no fill which has same stroke as subsequent path. + * A hack. This will remove a stroked path with no fill which has same stroke as subsequent path (or is its prefix). * This happens in the morphshape edges. This needs to be cleaned up before exporting to FLA. * * @param layer @@ -1001,7 +1016,7 @@ public class XFLConverter { if (prevStrokeOnly != null && strokeStyle != null && strokeStyle.equals(prevStrokeOnly) && - prevEdgesStr.equals(edgesStr)) { + edgesStr.startsWith(prevEdgesStr)) { Node edgeToRemove = prevNode; edgeToRemove.getParentNode().removeChild(edgeToRemove); } diff --git a/libsrc/ffdec_lib/testdata/as2/as2.fla b/libsrc/ffdec_lib/testdata/as2/as2.fla deleted file mode 100644 index 6d24adc45..000000000 Binary files a/libsrc/ffdec_lib/testdata/as2/as2.fla and /dev/null differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml b/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml new file mode 100644 index 000000000..d05819daa --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml @@ -0,0 +1,3352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ABC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Test Druhy radek Treti Ctvrty + + + + + + + + + + + + + Test2 + + + + + + + + + + + + + + + + + DynamicTest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hello World! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ABC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Banana_Slap-AngryFlash-2001109808.wav b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Banana_Slap-AngryFlash-2001109808.wav new file mode 100644 index 000000000..bdc68abc4 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Banana_Slap-AngryFlash-2001109808.wav differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Database-Delete-32.png b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Database-Delete-32.png new file mode 100644 index 000000000..9ff5b4801 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Database-Delete-32.png differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/MyButton.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/MyButton.xml new file mode 100644 index 000000000..38a9fd44f --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/MyButton.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Push + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Here + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Yay! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml new file mode 100644 index 000000000..eaff2309c --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/POOL-Pool_Shot-709343898.wav b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/POOL-Pool_Shot-709343898.wav new file mode 100644 index 000000000..cc2847e47 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/POOL-Pool_Shot-709343898.wav differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Page-White-Code-32.png b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Page-White-Code-32.png new file mode 100644 index 000000000..85f3faa4e Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Page-White-Code-32.png differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 1.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 1.xml new file mode 100644 index 000000000..7a911835b --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 1.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 2.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 2.xml new file mode 100644 index 000000000..b7d18e086 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 2.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 3.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 3.xml new file mode 100644 index 000000000..802a9f78c --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 3.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 4.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 4.xml new file mode 100644 index 000000000..62660f34a --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbol 4.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbolek.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbolek.xml new file mode 100644 index 000000000..5b56e4517 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Symbolek.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 1.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 1.xml new file mode 100644 index 000000000..f5988859b --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 1.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 2.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 2.xml new file mode 100644 index 000000000..4775d8097 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 2.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 3.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 3.xml new file mode 100644 index 000000000..f98463dcf --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 3.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 4.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 4.xml new file mode 100644 index 000000000..ef8f16b85 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 4.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 5.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 5.xml new file mode 100644 index 000000000..f2cf87b50 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/Tween 5.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/blue.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/blue.xml new file mode 100644 index 000000000..32e670e1f --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/blue.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/klikatice.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/klikatice.xml new file mode 100644 index 000000000..bee4014d8 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/klikatice.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/kolo.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/kolo.xml new file mode 100644 index 000000000..c6bcfb941 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/kolo.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/list.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/list.xml new file mode 100644 index 000000000..7e7503aa1 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/list.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + First Second Third Fourth ř + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/mycircle.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/mycircle.xml new file mode 100644 index 000000000..99a1c9d88 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/mycircle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/myclip.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/myclip.xml new file mode 100644 index 000000000..4fcc10de1 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/myclip.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/mystar.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/mystar.xml new file mode 100644 index 000000000..6373a4b3f --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/mystar.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/neck_snap-Vladimir-719669812.wav b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/neck_snap-Vladimir-719669812.wav new file mode 100644 index 000000000..f0e7bc0ea Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/neck_snap-Vladimir-719669812.wav differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/punch_or_whack_-Vladimir-403040765.wav b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/punch_or_whack_-Vladimir-403040765.wav new file mode 100644 index 000000000..712f30908 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/punch_or_whack_-Vladimir-403040765.wav differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/rectx.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/rectx.xml new file mode 100644 index 000000000..82aa2b786 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/rectx.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EditText + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/trojuh.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/trojuh.xml new file mode 100644 index 000000000..1135c5864 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/trojuh.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/as2/as2/META-INF/metadata.xml new file mode 100644 index 000000000..2ffd1a058 --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/META-INF/metadata.xml @@ -0,0 +1,475 @@ + + + + + Adobe Flash CS4 Professional + 2010-08-03T10:48:58+02:00 + 2023-03-16T08:40:37-07:00 + 2023-03-16T08:40:37-07:00 + + + application/vnd.adobe.fla + + + + xmp.iid:EFEB4FF7CAC3ED11AC9DC078F41E1AA7 + xmp.did:8DD71700DC9EDF1194ADAC9B23608190 + xmp.did:8DD71700DC9EDF1194ADAC9B23608190 + + xmp.did:F0EB4FF7CAC3ED11AC9DC078F41E1AA7 + xmp.iid:F0EB4FF7CAC3ED11AC9DC078F41E1AA7 + xmp.did:8DD71700DC9EDF1194ADAC9B23608190 + + + + created + xmp.iid:8DD71700DC9EDF1194ADAC9B23608190 + 2010-08-03T10:49:17+02:00 + Adobe Flash CS4 Professional + + + created + xmp.iid:CC2D8D7E6B5DE211A4ABFBFC2ED28025 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:58C72D217B62E211BD8B86228DEF5FAA + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:9E259E01D072E211BD50B3C0A69FEC78 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:F69E4292547EE211B6E4DBB09D6E2006 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:FEDE93AED683E2118638829B3307C520 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:B0CB9A930785E2119EC4FF3DE0E0F941 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:5A2BDDDB8F9CE2118019C24E0288673E + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:7BDCDD91DA9EE211A73AE1D5C5F6D7FB + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:AB8A29C54DA1E211B672BE9827903EAA + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:F93EF0EDE7A7E211B4478AB40381447D + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:89046678BCA9E211B4478AB40381447D + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:515163C020C6E211AE78AE55A67F0648 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:9FC80EDE84CAE211907B84F22B73CFFB + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:C4A6C1DE92CAE211959FFE1F951D7301 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:C7A6C1DE92CAE211959FFE1F951D7301 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:B2D700A345CBE2119A709C1F63375328 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:13AA81956ED0E2119A709C1F63375328 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:C446A82A1EDCE2119FC696432BA7236C + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:6C4225AD56DFE2119FC696432BA7236C + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:F569B64FD2E6E211945EA4D9CEAD84C2 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:E395D78EE6EBE211945EA4D9CEAD84C2 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:B09353E749EDE211B747C356B1F51107 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:2E9C577E1CEEE211B747C356B1F51107 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:329C577E1CEEE211B747C356B1F51107 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:B61A4AF1E7EFE211B747C356B1F51107 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:A60B34EC48F9E211BCD0BBCBCCC72CA5 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:AF0790382708E3118BF4A4602DDA2532 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:CAD2BA55D9C9E3119CB3A7E733051817 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:FE9175690FCDE311A922CFF1A76D5472 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:6D35B5B975CDE31185B6C80AAC153E7C + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:AC6E4D53F1D6E3119B72A8DBB41A2A83 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:6D9085970812E511B8B8B7CA4772C8BB + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:E697CE5E6212E511ACF98393F78C6F85 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:FE24CFC2988AE51199F7B8BF00614564 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:E9124790ECBCE511BE19F53C38E2C0F6 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:12F606E53BCCE51192AD996EC97B097B + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:346B6362A9D7E511A87796A6C6B5F093 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:99CD25A3BAD7E511A87796A6C6B5F093 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:ED49A7FF8689E61198CAC5A54772E309 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:4BB7E4B870FEE711A1BDB9F47C7391B4 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:9ABF33365803E811AC87853454298799 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:5C8B790AEB03E811ABD59C3A7D565B1B + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:0B990FFF8205E8119F09A6FA80179D07 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:5EDEB9CBB660E811A2BE81B4A1CEB507 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:790A11FEFC60E811A2BE81B4A1CEB507 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:D6FC18028561E811B671FC1B29D7E7B1 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:5694B620B461E811B671FC1B29D7E7B1 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 537 + + + created + xmp.iid:9D22E8CED76DEB11A62EFEC4DA64655F + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:2C27892FA46EEB11993CD28AB48136ED + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:6B9024374C6FEB1193A6AB4D6A68336F + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:10ACBD5C1771EB11BCAECBAFB1B6BADE + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:406C8B3BA171EB11BBB9C27DC8250202 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:711BA5658072EB11B281F7A6AE3464A7 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:630D0924DF7DEB1191AB862EF7C05742 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:3925AA97167FEB11A1E18620B3889E8A + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:7DD53DBCFF7FEB11A54DFE180625CE8C + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:1BFFF9A7468DEB11841FE2E586F5E8F0 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:21392EB48B48EC11BDB1830CB0A4A162 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:3E26C500F049EC11B1F9ACB65C3EA511 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:58BED799E44AEC11B1F9ACB65C3EA511 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:6AF24934664DEC119BE2BFF616FCB293 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:555070BA8D4EEC118EC6DBA80AAFBA90 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:72904BFE3650EC118EC6DBA80AAFBA90 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:30B896C37852EC118EC6DBA80AAFBA90 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:153A4ACD015CED11A1EABFD787B806F4 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:FE561CB81F68ED11A9C4C840BD56ED70 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:FB2B755958C3ED11AC9DC078F41E1AA7 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:EFEB4FF7CAC3ED11AC9DC078F41E1AA7 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + created + xmp.iid:F0EB4FF7CAC3ED11AC9DC078F41E1AA7 + 2010-08-03T10:48:58+02:00 + Adobe Flash Professional CS6 - build 481 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/MobileSettings.xml b/libsrc/ffdec_lib/testdata/as2/as2/MobileSettings.xml new file mode 100644 index 000000000..e69de29bb diff --git a/libsrc/ffdec_lib/testdata/as2/as2/PublishSettings.xml b/libsrc/ffdec_lib/testdata/as2/as2/PublishSettings.xml new file mode 100644 index 000000000..cd07bc82e --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/PublishSettings.xml @@ -0,0 +1,210 @@ + + + + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + as2.swf + as2.exe + as2.app + as2.html + as2.gif + as2.jpg + as2.png + as2.mov + as2.smil + as2.swc + + + 0 + 10,0,2,0;11,4,0,0;11,3,0,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_content.html + as2_alternate.html + 0 + + 550 + 400 + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 4 + 0 + 0 + 1 + 0 + C:\Users\jindr_000\AppData\Local\Adobe\Flash CS6\en_US\Configuration\HTML\Default.html + 1 + + + + + 0 + 0 + 0 + 80 + 0 + 0 + 7 + 0 + 7 + 0 + 12 + FlashPlayer10.3 + 2 + 1 + + . + CONFIG::FLASH_AUTHORING="true"; + 0 + + 1 + 0 + 0 + 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 + + + . + external + + + $(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 + 0 + 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/as2/as2.xfl b/libsrc/ffdec_lib/testdata/as2/as2/as2.xfl new file mode 100644 index 000000000..860a820ec --- /dev/null +++ b/libsrc/ffdec_lib/testdata/as2/as2/as2.xfl @@ -0,0 +1 @@ +PROXY-CS5 \ No newline at end of file diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/M 1 1369601308.dat b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 1 1369601308.dat new file mode 100644 index 000000000..09e407785 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 1 1369601308.dat differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/M 2 1369602672.dat b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 2 1369602672.dat new file mode 100644 index 000000000..3ccadc78d Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 2 1369602672.dat differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/M 3 1454699812.dat b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 3 1454699812.dat new file mode 100644 index 000000000..9fcddd6c4 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 3 1454699812.dat differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/M 4 1454699852.dat b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 4 1454699852.dat new file mode 100644 index 000000000..6b5874134 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 4 1454699852.dat differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/M 5 1454699855.dat b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 5 1454699855.dat new file mode 100644 index 000000000..85dea23a9 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 5 1454699855.dat differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/M 6 1454699917.dat b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 6 1454699917.dat new file mode 100644 index 000000000..5796906b6 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/bin/M 6 1454699917.dat differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/as2/as2/bin/SymDepend.cache new file mode 100644 index 000000000..1185405c7 Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as2/as2/bin/SymDepend.cache differ