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

AMF3 editor in GUI fixes

Browse Source 
Hex view fixes
This commit is contained in:
Jindra Petřík
2016-07-22 21:35:48 +02:00
parent 1c9e485dca
commit 01c2079b07
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStream.java
View File

@@ -34,11 +34,10 @@ public class Amf3InputStream extends InputStream {
public final static Logger LOGGER = Logger.getLogger(Amf3InputStream.class.getName());
private final MemoryInputStream is;
public DumpInfo dumpInfo;
private static String NO_REFERENCE_BIT_TEXT = "not reference";
private static String REFERENCE_BIT_TEXT = "not reference";
private static String OBJECT_INDEX_TEXT = "object index";
private static String STRING_INDEX_TEXT = "string index";
private static String TRAIT_INDEX_TEXT = "trait index";
private static final String NO_REFERENCE_BIT_TEXT = "not reference";
private static final String OBJECT_INDEX_TEXT = "object index";
private static final String STRING_INDEX_TEXT = "string index";
private static final String TRAIT_INDEX_TEXT = "trait index";
public Amf3InputStream(MemoryInputStream is) {
this.is = is;
@@ -146,11 +145,11 @@ public class Amf3InputStream extends InputStream {
}
private void renameU29O_ref() {
renameU29("U29O-ref", REFERENCE_BIT_TEXT, OBJECT_INDEX_TEXT);
renameU29("U29O-ref", NO_REFERENCE_BIT_TEXT, OBJECT_INDEX_TEXT);
}
private void renameU29S_ref() {
renameU29("U29S-ref", REFERENCE_BIT_TEXT, STRING_INDEX_TEXT);
renameU29("U29S-ref", NO_REFERENCE_BIT_TEXT, STRING_INDEX_TEXT);
}
private void renameU29Traits_ref() {
@@ -493,7 +492,7 @@ public class Amf3InputStream extends InputStream {
result = retObjectType;
break markerswitch;
} else {
renameU29("U29O-traits", NO_REFERENCE_BIT_TEXT, "not trait reference", "not externalized traits", "dynamic", "sealed count");
renameU29("U29O-traits", NO_REFERENCE_BIT_TEXT, "not trait reference", "externalized traits", "dynamic", "sealed count");
int dynamicFlag = (int) ((objectU29 >> 3) & 1);
int numSealed = (int) (objectU29 >> 4);
LOGGER.log(Level.FINEST, "object dynamicFlag:{0}", dynamicFlag);

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3Value.java
View File

@@ -7,6 +7,10 @@ public class Amf3Value {
private Object value;
public Amf3Value() {
setValue(null);
}
public Amf3Value(Object value) {
setValue(value);
}
@@ -19,6 +23,9 @@ public class Amf3Value {
}
public static boolean isValueValid(Object value) {
if (value == null) {
return true;
}
if (value instanceof Long) {
return true;
}
@@ -43,6 +50,9 @@ public class Amf3Value {
@Override
public String toString() {
if (value == null) {
return "";
}
return Amf3Exporter.amfToString(value);
}
}

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObject4Tag.java
View File

@@ -430,8 +430,7 @@ public class PlaceObject4Tag extends PlaceObjectTypeTag implements ASMSourceCont
if (placeFlagHasClipActions) {
sos.writeCLIPACTIONS(clipActions);
}
if (amfData != null) {
//sos.write(Helper.readFile("d:\\Dropbox\\Programovani\\JavaSE\\FFDec\\libsrc\\ffdec_lib\\testdata\\amf3\\generated\\all.bin"));
if (amfData != null && amfData.getValue() != null) {
try {
sos.writeAmf3Object(amfData);
} catch (NoSerializerExistsException ex) {