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

Fixed #1888 Resolve properties on protected namespaces

Browse Source
This commit is contained in:
Jindra Petřík
2022-11-27 09:59:10 +01:00
parent 7ed6ea1f9a
commit 2a68570103
14 changed files with 111 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java
View File

@@ -72,9 +72,9 @@ public class GetLexIns extends InstructionDefinition {
GraphTargetItem thisPropType = TypeItem.UNBOUNDED;
if (currentClassName != null) {
if (call) {
thisPropType = localData.abcIndex.findPropertyCallType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multinameIndex).namespace_index, true, true);
thisPropType = localData.abcIndex.findPropertyCallType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multinameIndex).namespace_index, true, true, true);
} else {
thisPropType = localData.abcIndex.findPropertyType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multinameIndex).namespace_index, true, true);
thisPropType = localData.abcIndex.findPropertyType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multinameIndex).namespace_index, true, true, true);
}
}
if (!thisPropType.equals(TypeItem.UNBOUNDED)) {

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java
View File

@@ -165,9 +165,9 @@ public class GetPropertyIns extends InstructionDefinition {
GraphTargetItem thisPropType = TypeItem.UNBOUNDED;
if (currentClassName != null) {
if (call) {
thisPropType = localData.abcIndex.findPropertyCallType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, true, true);
thisPropType = localData.abcIndex.findPropertyCallType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, true, true, true);
} else {
thisPropType = localData.abcIndex.findPropertyType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, true, true);
thisPropType = localData.abcIndex.findPropertyType(localData.abc, new TypeItem(currentClassName), multinameStr, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, true, true, true);
}
}
if (!thisPropType.equals(TypeItem.UNBOUNDED)) {
@@ -230,9 +230,9 @@ public class GetPropertyIns extends InstructionDefinition {
if (type == null)
{
if (call) {
type = localData.abcIndex.findPropertyCallType(localData.abc, receiverType, multiname.resolvedMultinameName, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, parentStatic, !parentStatic);
type = localData.abcIndex.findPropertyCallType(localData.abc, receiverType, multiname.resolvedMultinameName, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, parentStatic, !parentStatic, false);
} else {
type = localData.abcIndex.findPropertyType(localData.abc, receiverType, multiname.resolvedMultinameName, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, parentStatic, !parentStatic);
type = localData.abcIndex.findPropertyType(localData.abc, receiverType, multiname.resolvedMultinameName, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, parentStatic, !parentStatic, false);
}
}
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
View File

@@ -2636,7 +2636,7 @@ public class AVM2SourceGenerator implements SourceGenerator {
isType.setVal(false);
AbcIndexing.TraitIndex sp = abc.findScriptProperty(pkg.addWithSuffix(propertyName));
if (sp == null) {
sp = abc.findProperty(new AbcIndexing.PropertyDef(propertyName, new TypeItem(pkg.addWithSuffix(obj)), abc.getSelectedAbc(), selectedNs), !instanceOnly, true);
sp = abc.findProperty(new AbcIndexing.PropertyDef(propertyName, new TypeItem(pkg.addWithSuffix(obj)), abc.getSelectedAbc(), selectedNs), !instanceOnly, true, true);
}
if (sp != null) {
if (sp.trait instanceof TraitClass) {

102
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AbcIndexing.java
View File

@@ -108,6 +108,8 @@ public final class AbcIndexing {
private final String propName;
private String propNsString = null;
private final GraphTargetItem parent;
private int propNsIndex = 0;
@@ -116,7 +118,7 @@ public final class AbcIndexing {
@Override
public String toString() {
return parent.toString() + ":" + propName + (propNsIndex > 0 ? "[ns:" + propNsIndex + "]" : "");
return parent.toString() + ":" + propName + (propNsIndex > 0 ? "[ns:" + propNsIndex + "]" : "") + (propNsString != null ? "[ns: " + propNsString + "]" : "");
}
private void setPrivate(ABC abc, int propNsIndex) {
@@ -124,10 +126,19 @@ public final class AbcIndexing {
this.abc = abc;
}
private void setProtected(ABC abc, int propNsIndex) {
this.abc = null;
this.propNsString = abc.constants.getNamespace(propNsIndex).getRawName(abc.constants);
}
public String getPropertyName() {
return propName;
}
public String getPropNsString() {
return propNsString;
}
/**
* Creates key to property.
*
@@ -154,24 +165,37 @@ public final class AbcIndexing {
return;
}
int k = abc.constants.getNamespace(propNsIndex).kind;
if (k != Namespace.KIND_PACKAGE && propNsIndex != builtInIndex) {
setPrivate(abc, propNsIndex);
if (k != Namespace.KIND_PACKAGE && propNsIndex != builtInIndex) {
if (k == Namespace.KIND_PROTECTED) {
setProtected(abc, propNsIndex);
} else {
setPrivate(abc, propNsIndex);
}
}
}
public PropertyDef(String propName, GraphTargetItem parent, String propNsString) {
this.propName = propName;
this.parent = parent;
this.abc = null;
this.propNsString = propNsString;
}
@Override
public int hashCode() {
int hash = 7;
hash = 17 * hash + Objects.hashCode(this.propName);
hash = 17 * hash + Objects.hashCode(this.parent);
hash = 17 * hash + this.propNsIndex;
//?
//hash = 17 * hash + System.identityHashCode(this.abc);
int hash = 3;
hash = 37 * hash + Objects.hashCode(this.propName);
hash = 37 * hash + Objects.hashCode(this.propNsString);
hash = 37 * hash + Objects.hashCode(this.parent);
hash = 37 * hash + this.propNsIndex;
return hash;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
@@ -179,18 +203,18 @@ public final class AbcIndexing {
return false;
}
final PropertyDef other = (PropertyDef) obj;
if (!Objects.equals(this.propName, other.propName)) {
return false;
}
if (!Objects.equals(this.parent, other.parent)) {
return false;
}
if (this.propNsIndex != other.propNsIndex) {
return false;
}
return true; //?
//return (this.abc == other.abc);
if (!Objects.equals(this.propName, other.propName)) {
return false;
}
if (!Objects.equals(this.propNsString, other.propNsString)) {
return false;
}
return Objects.equals(this.parent, other.parent);
}
}
/**
@@ -330,16 +354,16 @@ public final class AbcIndexing {
return classes.get(cls);
}
public GraphTargetItem findPropertyType(ABC abc, GraphTargetItem cls, String propName, int ns, boolean findStatic, boolean findInstance) {
TraitIndex traitIndex = findProperty(new PropertyDef(propName, cls, abc, ns), findStatic, findInstance);
public GraphTargetItem findPropertyType(ABC abc, GraphTargetItem cls, String propName, int ns, boolean findStatic, boolean findInstance, boolean findProtected) {
TraitIndex traitIndex = findProperty(new PropertyDef(propName, cls, abc, ns), findStatic, findInstance, findProtected);
if (traitIndex == null) {
return TypeItem.UNBOUNDED;
}
return traitIndex.returnType;
}
public GraphTargetItem findPropertyCallType(ABC abc, GraphTargetItem cls, String propName, int ns, boolean findStatic, boolean findInstance) {
TraitIndex traitIndex = findProperty(new PropertyDef(propName, cls, abc, ns), findStatic, findInstance);
public GraphTargetItem findPropertyCallType(ABC abc, GraphTargetItem cls, String propName, int ns, boolean findStatic, boolean findInstance, boolean findProtected) {
TraitIndex traitIndex = findProperty(new PropertyDef(propName, cls, abc, ns), findStatic, findInstance, findProtected);
if (traitIndex == null) {
return TypeItem.UNBOUNDED;
}
@@ -390,20 +414,20 @@ public final class AbcIndexing {
return null;
}
public TraitIndex findProperty(PropertyDef prop, boolean findStatic, boolean findInstance) {
public TraitIndex findProperty(PropertyDef prop, boolean findStatic, boolean findInstance, boolean findProtected) {
/*System.out.println("searching " + prop);
for (PropertyDef p : instanceProperties.keySet()) {
if (p.parent.equals(new TypeItem("__AS3__.vec.Vector"))) {
if (p.parent.equals(new TypeItem("tests_classes.TestConvertParent"))) {
System.out.println("- " + p);
}
}
System.out.println("-----------");*/
System.out.println("-----------");
*/
//search all static first
if (findStatic && classProperties.containsKey(prop)) {
if (!classProperties.containsKey(prop)) {
if (parent != null) {
TraitIndex ret = parent.findProperty(prop, findStatic, findInstance);
TraitIndex ret = parent.findProperty(prop, findStatic, findInstance, findProtected);
if (ret != null) {
return ret;
}
@@ -417,7 +441,7 @@ public final class AbcIndexing {
if (findInstance && instanceProperties.containsKey(prop)) {
if (!instanceProperties.containsKey(prop)) {
if (parent != null) {
TraitIndex ret = parent.findProperty(prop, findStatic, findInstance);
TraitIndex ret = parent.findProperty(prop, findStatic, findInstance, findProtected);
if (ret != null) {
return ret;
}
@@ -430,22 +454,26 @@ public final class AbcIndexing {
//now search parent class
AbcIndexing.ClassIndex ci = findClass(prop.parent);
if (ci != null && ci.parent != null && (prop.abc == null || prop.propNsIndex == 0)) {
ci = ci.parent;
//parent protected
DottedChain parentClass = ci.abc.instance_info.get(ci.index).getName(ci.abc.constants).getNameWithNamespace(ci.abc.constants, true);
TraitIndex pti = findProperty(new PropertyDef(prop.propName, new TypeItem(parentClass), ci.abc, ci.abc.instance_info.get(ci.index).protectedNS), findStatic, findInstance);
if (pti != null) {
return pti;
}
//parent public
pti = findProperty(new PropertyDef(prop.propName, new TypeItem(parentClass), null, 0), findStatic, findInstance);
AbcIndexing.ClassIndex ciParent = ci.parent;
DottedChain parentClass = ciParent.abc.instance_info.get(ciParent.index).getName(ciParent.abc.constants).getNameWithNamespace(ciParent.abc.constants, true);
TraitIndex pti = findProperty(new PropertyDef(prop.propName, new TypeItem(parentClass), prop.getPropNsString()), findStatic, findInstance, findProtected);
if (pti != null) {
return pti;
}
}
/*if (findProtected && prop.propNsIndex == 0) {
if (ci != null) {
int protNs = ci.abc.instance_info.get(ci.index).protectedNS;
PropertyDef prop2 = new PropertyDef(prop.propName, prop.parent, prop.abc, protNs);
TraitIndex pti = findProperty(prop2, findStatic, findInstance, false);
if (pti != null) {
return pti;
}
}
}*/
if (parent != null) {
TraitIndex pti = parent.findProperty(prop, findStatic, findInstance);
TraitIndex pti = parent.findProperty(prop, findStatic, findInstance, findProtected);
if (pti != null) {
return pti;
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/PropertyAVM2Item.java
View File

@@ -219,7 +219,7 @@ public class PropertyAVM2Item extends AssignableAVM2Item {
// however this namespace is in the ABC of the super class and not in abcIndex.getSelectedAbc()
AbcIndexing.ClassIndex ci = abcIndex.findClass(objType);
int superProtectedNs = ci.abc.instance_info.get(ci.index).protectedNS;
AbcIndexing.TraitIndex sp = abcIndex.findProperty(new AbcIndexing.PropertyDef(propertyName, objType, ci.abc, superProtectedNs), false, true);
AbcIndexing.TraitIndex sp = abcIndex.findProperty(new AbcIndexing.PropertyDef(propertyName, objType, ci.abc, superProtectedNs), false, true, true);
if (sp != null) {
objType = sp.objType;
Namespace ns = sp.trait.getName(sp.abc).getNamespace(sp.abc.constants);

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
View File

@@ -230,7 +230,7 @@ public class TraitClass extends Trait implements TraitWithSlot {
if (sIndex > -1) {
int nsIndex = abc.constants.getNamespaceId(Namespace.KIND_PACKAGE, DottedChain.TOPLEVEL, sIndex, false);
if (nsIndex > -1) {
convertData.thisHasDefaultToPrimitive = null == index.findProperty(new AbcIndexing.PropertyDef("toString", new TypeItem(instanceInfo.getName(abc.constants).getNameWithNamespace(abc.constants, true)), abc, nsIndex), false, true);
convertData.thisHasDefaultToPrimitive = null == index.findProperty(new AbcIndexing.PropertyDef("toString", new TypeItem(instanceInfo.getName(abc.constants).getNameWithNamespace(abc.constants, true)), abc, nsIndex), false, true, false);
} else {
convertData.thisHasDefaultToPrimitive = true;
}