diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java index fbd1c8164..a31e90123 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -1056,9 +1056,10 @@ public class SWFInputStream implements AutoCloseable { * @throws java.lang.InterruptedException */ public List readTagList(Timelined timelined, int level, boolean parallel, boolean skipUnusualTags, boolean parseTags) throws IOException, InterruptedException { + boolean parallel1 = level == 0 && parallel; ExecutorService executor = null; List> futureResults = new ArrayList<>(); - if (parallel) { + if (parallel1) { executor = Executors.newFixedThreadPool(Configuration.getParallelThreadCount()); futureResults = new ArrayList<>(); } @@ -1069,7 +1070,7 @@ public class SWFInputStream implements AutoCloseable { long pos = getPos(); newDumpLevel(null, "TAG"); try { - tag = readTag(timelined, level, pos, parseTags && !parallel, parallel, skipUnusualTags); + tag = readTag(timelined, level, pos, parseTags && !parallel1, parallel1, skipUnusualTags); } catch (EOFException | EndOfStreamException ex) { tag = null; } @@ -1083,7 +1084,7 @@ public class SWFInputStream implements AutoCloseable { } tag.setTimelined(timelined); - if (!parallel) { + if (!parallel1) { tags.add(tag); } if (Configuration.dumpTags.get() && level == 0) { @@ -1097,7 +1098,7 @@ public class SWFInputStream implements AutoCloseable { switch (tag.getId()) { case FileAttributesTag.ID: // FileAttributes if (tag instanceof TagStub) { - tag = resolveTag((TagStub) tag, level, parallel, skipUnusualTags, true); + tag = resolveTag((TagStub) tag, level, parallel1, skipUnusualTags, true); } FileAttributesTag fileAttributes = (FileAttributesTag) tag; if (fileAttributes.actionScript3) { @@ -1138,8 +1139,8 @@ public class SWFInputStream implements AutoCloseable { } } - if (parseTags && doParse && parallel && tag instanceof TagStub) { - Future future = executor.submit(new TagResolutionTask((TagStub) tag, di, level, parallel, skipUnusualTags)); + if (parseTags && doParse && parallel1 && tag instanceof TagStub) { + Future future = executor.submit(new TagResolutionTask((TagStub) tag, di, level, parallel1, skipUnusualTags)); futureResults.add(future); } else { Future future = new ImmediateFuture<>(tag); @@ -1156,7 +1157,7 @@ public class SWFInputStream implements AutoCloseable { } } - if (parallel) { + if (parallel1) { for (Future future : futureResults) { try { tags.add(future.get()); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index ac8491f7f..26a857c43 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -574,7 +574,7 @@ public class AVM2Code implements Cloneable { new InstructionDefinition(0x22, "pushuninitialized", new int[]{AVM2Code.OPT_U30}) { @Override public int getStackDelta(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); } @Override @@ -765,39 +765,6 @@ public class AVM2Code implements Cloneable { throw new UnsupportedOperationException(); } - @Override - public int getScopeStackDelta(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); - } - }, - new InstructionDefinition(0xfe, "verifyop", new int[]{}) { - @Override - public int getStackDelta(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); - } - - @Override - public int getScopeStackDelta(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); - } - }, - new InstructionDefinition(0xf5, "verifypass", new int[]{}) { - @Override - public int getStackDelta(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); - } - - @Override - public int getScopeStackDelta(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); - } - }, - new InstructionDefinition(0xf8, "wb", new int[]{}) { - @Override - public int getStackDelta(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); - } - @Override public int getScopeStackDelta(AVM2Instruction ins, ABC abc) { throw new UnsupportedOperationException(); diff --git a/src/com/jpexs/decompiler/flash/gui/locales/proxy/ProxyFrame_ca.properties b/src/com/jpexs/decompiler/flash/gui/locales/proxy/ProxyFrame_ca.properties index 185693896..5d80a1b45 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/proxy/ProxyFrame_ca.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/proxy/ProxyFrame_ca.properties @@ -24,3 +24,12 @@ sniff = Esnifa: dialog.title = Proxy error = Error error.port = Format erroni del n\u00famero de port. +copy.url = Copia URL +save.as = Anomena i desa... +replace = Substitueix... +error.save.as = No es pot desar el fitxer +error.replace = No es poden substituir les dades +error.start.server = No es pot iniciar el servidor al port %port%. Comprova que el port no est\u00e0 bloquejat per una altra aplicaci\u00f3, si et plau. +column.accessed = Accedit +column.size = Mida +column.url = URL