LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-28 07:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

some more ByteArraRange objects instead of reading them to new byte array, method to read netstings (length + characters) in SwfInputStream

Browse Source
This commit is contained in:
honfika@gmail.com
2015-07-27 11:21:26 +02:00
parent c9f1f45ed5
commit c5d960f10b
18 changed files with 124 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java
View File

@@ -277,6 +277,7 @@ import java.io.ByteArrayOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.PrintStream;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -467,7 +468,7 @@ public class SWFInputStream implements AutoCloseable {
}
/**
* Reads one string value from the stream
* Reads one null terminated string value from the stream
*
* @param name
* @return String value
@@ -487,6 +488,37 @@ public class SWFInputStream implements AutoCloseable {
}
}
/**
* Reads one netstring (length + string) value from the stream
*
* @param name
* @return String value
* @throws IOException
*/
public String readNetString(String name) throws IOException {
newDumpLevel(name, "string");
int length = readEx();
String ret = new String(readBytesInternalEx(length));
endDumpLevel();
return ret;
}
/**
* Reads one netstring (length + string) value from the stream
*
* @param name
* @param charset
* @return String value
* @throws IOException
*/
public String readNetString(String name, Charset charset) throws IOException {
newDumpLevel(name, "string");
int length = readEx();
String ret = new String(readBytesInternalEx(length), charset);
endDumpLevel();
return ret;
}
/**
* Reads one UI32 (Unsigned 32bit integer) value from the stream
*
@@ -703,6 +735,7 @@ public class SWFInputStream implements AutoCloseable {
if (count <= 0) {
return BYTE_ARRAY_EMPTY;
}
newDumpLevel(name, "bytes");
byte[] ret = readBytesInternalEx(count);
endDumpLevel();
@@ -721,6 +754,7 @@ public class SWFInputStream implements AutoCloseable {
if (count <= 0) {
return ByteArrayRange.EMPTY;
}
newDumpLevel(name, "bytes");
int startPos = (int) getPos();
skipBytesEx(count);
@@ -770,6 +804,23 @@ public class SWFInputStream implements AutoCloseable {
informListeners();
}
/**
* Skip bytes from the stream
*
* @param count Number of bytes to skip
* @param name
* @throws IOException
*/
public void skipBytesEx(long count, String name) throws IOException {
if (count <= 0) {
return;
}
newDumpLevel(name, "bytes");
skipBytesEx(count);
endDumpLevel();
}
/**
* Skip bytes from the stream
*
@@ -1489,7 +1540,7 @@ public class SWFInputStream implements AutoCloseable {
}
if (sis.available() > 0) {
ret.remainingData = sis.readBytesEx(sis.available(), "remaining");
ret.remainingData = sis.readByteRangeEx(sis.available(), "remaining");
}
} catch (IOException ex) {
logger.log(Level.SEVERE, "Error during tag reading. SWF: " + swf.getShortFileName() + " ID: " + tag.getId() + " name: " + tag.getName() + " pos: " + data.getPos(), ex);
@@ -3344,6 +3395,7 @@ public class SWFInputStream implements AutoCloseable {
for (int i = 0; i < colorTableSize + 1; i++) {
ret.colorTableRGB[i] = readRGBInt("colorTableRGB");
}
int dataLen = 0;
for (int y = 0; y < bitmapHeight; y++) {
int x = 0;
@@ -3355,6 +3407,7 @@ public class SWFInputStream implements AutoCloseable {
x++;
}
}
ret.colorMapPixelData = readBytesEx(dataLen, "colorMapPixelData");
endDumpLevel();
return ret;
@@ -3444,6 +3497,7 @@ public class SWFInputStream implements AutoCloseable {
for (int i = 0; i < colorTableSize + 1; i++) {
ret.colorTableRGB[i] = readRGBAInt("colorTableRGB");
}
int dataLen = 0;
for (int y = 0; y < bitmapHeight; y++) {
int x = 0;
@@ -3455,7 +3509,8 @@ public class SWFInputStream implements AutoCloseable {
x++;
}
}
ret.colorMapPixelData = readBytesEx(dataLen, "");
ret.colorMapPixelData = readBytesEx(dataLen, "colorMapPixelData");
endDumpLevel();
return ret;
}