alterwain/SWFDissect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decompiler improvement, compiler improvement x3

Browse Source
This commit is contained in:
Michael Wain 2025-01-04 23:39:51 +03:00
parent 68c221eb32
commit ad70af4279
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/alterdekim/flash/decompiler/Main.java
View File

@ -17,7 +17,7 @@ import java.nio.file.StandardOpenOption;
public class Main { public class Main {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
FlashDecompiler decompiler = new FlashDecompiler(); FlashDecompiler decompiler = new FlashDecompiler();
ShockwaveFile file = decompiler.loadFromFile(new File("catalogs.swf")); // D:\Documents\FlashProjects\Untitled-2.swf ShockwaveFile file = decompiler.loadFromFile(new File("D:\\Documents\\FlashProjects\\Untitled-2.swf")); //
DoAction da = (DoAction) file.getTags() DoAction da = (DoAction) file.getTags()
.stream() .stream()
@ -30,6 +30,6 @@ public class Main {
if( out.exists() ) out.delete(); if( out.exists() ) out.delete();
//objectMapper.writeValue(out, new Flash2Java(da).convert()); //objectMapper.writeValue(out, new Flash2Java(da).convert());
var j2f = new Java2Flash().convert(new Flash2Java(da).convert()); var j2f = new Java2Flash().convert(new Flash2Java(da).convert());
Files.write(Path.of("./export1.swf"), new FlashCompiler(j2f).compile(), StandardOpenOption.CREATE); Files.write(Path.of("export1.swf"), new FlashCompiler(j2f).compile(), StandardOpenOption.CREATE);
} }
} }

2
src/main/java/com/alterdekim/flash/decompiler/compiler/FlashCompiler.java
View File

@ -33,7 +33,7 @@ public class FlashCompiler {
d1.addAll(new End().compile()); d1.addAll(new End().compile());
// fileSize u32 // fileSize u32
log.info("fileSize u32: {}", d1.size()); log.info("fileSize u32: {}", d1.size());
data.addAll(ByteUtil.intToBytes32(d1.size())); data.addAll(ByteUtil.intToBytes32(d1.size()+data.size()+4));
data.addAll(d1); data.addAll(d1);
return ByteUtil.toPrimitive(data); return ByteUtil.toPrimitive(data);
} }

10
src/main/java/com/alterdekim/flash/decompiler/tag/DoAction.java
View File

@ -35,10 +35,10 @@ public class DoAction extends ShockwaveTag implements CompileObject {
List<Byte> bytes = new ArrayList<>(); List<Byte> bytes = new ArrayList<>();
this.actions.forEach(action -> { this.actions.forEach(action -> {
bytes.add(action.getType().id); bytes.add(action.getType().id);
List<Byte> data = new ArrayList<>();
switch(action.getType()) { switch(action.getType()) {
case Push: case Push:
ActionPush push = (ActionPush) action; ActionPush push = (ActionPush) action;
List<Byte> data = new ArrayList<>();
push.getItems().forEach(item -> { push.getItems().forEach(item -> {
data.add((byte) item.getType().type); data.add((byte) item.getType().type);
switch (item.getType()) { switch (item.getType()) {
@ -65,17 +65,19 @@ public class DoAction extends ShockwaveTag implements CompileObject {
break; break;
case ConstantPool: case ConstantPool:
ActionConstantPool pool = (ActionConstantPool) action; ActionConstantPool pool = (ActionConstantPool) action;
bytes.addAll(ByteUtil.intToBytes(pool.getPool().size())); // maybe there should also be u8 size of data data.addAll(ByteUtil.intToBytes(pool.getPool().size()));
pool.getPool().forEach(s -> { pool.getPool().forEach(s -> {
bytes.addAll(fromString(s)); data.addAll(fromString(s));
}); });
bytes.addAll(ByteUtil.intToBytes(data.size()));
bytes.addAll(data);
break; break;
} }
}); });
bytes.add((byte) 0x0); bytes.add((byte) 0x0);
int val = getType().getId() << 6; int val = getType().getId() << 6;
val |= 63; // 265955 val |= 63; // 265955
return Stream.of( ByteUtil.intToBytes(val), ByteUtil.intToBytes32(bytes.size()+6), bytes ).flatMap(Collection::stream).collect(Collectors.toList()); return Stream.of( ByteUtil.intToBytes(val), ByteUtil.intToBytes32(bytes.size()), bytes ).flatMap(Collection::stream).collect(Collectors.toList());
} }
private List<Byte> fromString(String s) { private List<Byte> fromString(String s) {

4
src/main/java/com/alterdekim/flash/decompiler/util/ByteUtil.java
View File

@ -69,10 +69,10 @@ public class ByteUtil {
} }
public static List<Byte> doubleToBytes(double d) { public static List<Byte> doubleToBytes(double d) {
byte[] b = ByteBuffer.allocate(8).putDouble(d).array(); byte[] b = ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putDouble(d).array();
byte[] b1 = new byte[8]; byte[] b1 = new byte[8];
System.arraycopy(b, 0, b1, 4, 4);
System.arraycopy(b, 4, b1, 0, 4); System.arraycopy(b, 4, b1, 0, 4);
System.arraycopy(b, 0, b1, 4, 4);
return fromPrimitive(b1); return fromPrimitive(b1);
} }
} }