Skip to content

Commit ded81ef

Browse files
authored
1.9.14 - improve c typetreereader and fix loading for old Unity versions (K0lb3#128)
* TypeTreeHelper.C - make name, type writable, use typehash * Fix missing serialized_type issue for old Unity versions * 1.9.14 - version bump * Object.py - fix typo
1 parent 4c8c450 commit ded81ef

9 files changed

Lines changed: 96 additions & 45 deletions

File tree

‎UnityPy/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "1.9.13"
1+
__version__ = "1.9.14"
22

33
from .environment import Environment
44

‎UnityPy/classes/Object.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ def __init__(self, reader: ObjectReader):
3636
self.read_typetree()
3737

3838
def has_struct_member(self, name: str) -> bool:
39-
return self.serialized_type.m_Nodes and any(
40-
[x.name == name for x in self.serialized_type.m_Nodes]
39+
nodes = self.reader.get_typetree_nodes()
40+
return any(
41+
node.m_Name == name for node in nodes
4142
)
4243

4344
def dump_typetree(self, nodes: list = None) -> str:
@@ -84,14 +85,10 @@ def save(self, writer: EndianBinaryWriter = None, intern_call=False):
8485
if intern_call:
8586
if self.platform == BuildTarget.NoTarget:
8687
writer.write_u_int(self._object_hide_flags)
87-
elif self.serialized_type.nodes:
88+
else:
8889
# save for objects WITHOUT specific save function
8990
# so we have to use the typetree if it exists
9091
self.save_typetree()
91-
else:
92-
raise NotImplementedError(
93-
"There is no save function for this obj.type nor has it any typetree nodes that could be used."
94-
)
9592

9693
def _save(self, writer):
9794
# the reader is actually an ObjectReader,

‎UnityPy/environment.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def load_file(
130130
except Exception as e:
131131
# just to be sure
132132
# cuz the SerializedFile detection isn't perfect
133-
print("Error loading, reverting to EndianBinaryReader:\n", e)
133+
print("Error loading, reverting to EndianBinaryReader:\n", str(e))
134134
return EndianBinaryReader(file)
135135

136136
def load_zip_file(self, value):

‎UnityPy/files/ObjectReader.py‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def __init__(self, assets_file, reader: EndianBinaryReader):
3535
header = assets_file.header
3636
types = assets_file.types
3737

38+
# AssetStudio ObjectInfo init
3839
if assets_file.big_id_enabled:
3940
self.path_id = reader.read_long()
4041
elif header.version < 14:
@@ -58,16 +59,14 @@ def __init__(self, assets_file, reader: EndianBinaryReader):
5859
self.byte_size = reader.read_u_int()
5960

6061
self.type_id = reader.read_int()
62+
6163
if header.version < 16:
6264
self.class_id = reader.read_u_short()
63-
if types:
64-
self.serialized_type = (
65-
x for x in types if x.class_id == self.type_id
66-
).__next__()
67-
else:
68-
self.serialized_type = SerializedFile.SerializedType(
69-
reader, self.assets_file
70-
)
65+
self.serialized_type = None
66+
for typ in types:
67+
if typ.class_id == self.type_id:
68+
self.serialized_type = typ
69+
break
7170
else:
7271
typ = types[self.type_id]
7372
self.serialized_type = typ
@@ -197,18 +196,18 @@ def __repr__(self):
197196
def dump_typetree(self, nodes: list = None) -> str:
198197
self.reset()
199198
sb = []
200-
if nodes:
201-
TypeTreeHelper.read_typetree_str(sb, nodes, self)
202-
elif getattr(self.serialized_type, "nodes", None):
203-
TypeTreeHelper.read_typetree_str(sb, self.serialized_type.nodes, self)
204-
return "".join(sb)
205-
return ""
199+
nodes = self.get_typetree(nodes)
200+
TypeTreeHelper.read_typetree_str(sb, nodes, self)
201+
return "".join(sb)
206202

207203
def dump_typetree_structure(self) -> str:
208204
return TypeTreeHelper.dump_typetree(self.get_typetree_nodes())
209205

210206
def get_typetree_nodes(self, nodes: list = None) -> list:
211-
if not nodes:
207+
if nodes:
208+
return nodes
209+
210+
if self.serialized_type:
212211
nodes = self.serialized_type.nodes
213212
if not nodes:
214213
nodes = get_typetree_nodes(self.class_id, self.version)

‎UnityPy/files/SerializedFile.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,19 +318,21 @@ def read_type_tree(self):
318318
else:
319319
level_stack[-1][1] -= 1
320320

321-
type_tree_node = TypeTreeNode()
321+
type_tree_node = TypeTreeNode(
322+
m_Level = level,
323+
m_Type = self.reader.read_string_to_null(),
324+
m_Name = self.reader.read_string_to_null(),
325+
m_ByteSize = self.reader.read_int()
326+
)
327+
322328
type_tree.append(type_tree_node)
323-
type_tree_node.m_Level = level
324-
type_tree_node.m_Type = self.reader.read_string_to_null()
325-
type_tree_node.m_Name = self.reader.read_string_to_null()
326-
type_tree_node.m_ByteSize = self.reader.read_int()
327329
if self.header.version == 2:
328330
type_tree_node.m_VariableCount = self.reader.read_int()
329331

330332
if self.header.version != 3:
331333
type_tree_node.m_Index = self.reader.read_int()
332334

333-
type_tree_node.m_IsArray = self.reader.read_int()
335+
type_tree_node.m_IsArray = bool(self.reader.read_int())
334336
type_tree_node.m_Version = self.reader.read_int()
335337
if self.header.version != 3:
336338
type_tree_node.m_MetaFlag = self.reader.read_int()

‎UnityPy/tools/extractor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def exportMonoBehaviour(
174174
obj: Union[MonoBehaviour, Object], fp: str, extension: str = ""
175175
) -> List[int]:
176176
# TODO - add generic way to add external typetrees
177-
if obj.serialized_type.nodes:
177+
if obj.serialized_type and obj.serialized_type.nodes:
178178
extension = ".json"
179179
export = json.dumps(obj.read_typetree(), indent=4, ensure_ascii=False).encode(
180180
"utf8", errors="surrogateescape"

‎UnityPyBoost/TypeTreeHelper.c‎

Lines changed: 64 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ static PyObject *read_bool(Reader *reader);
6969
static PyObject *read_string(Reader *reader);
7070
static PyObject *read_TypelessData(Reader *reader);
7171

72-
static uint32_t hash_string(const char *str);
73-
7472
static read_type getReadFunction(int hash_value, int *index);
7573
static PyObject *getSubNodes(PyObject *nodes, int *index);
7674

@@ -92,8 +90,7 @@ static inline uint32_t hash_str(const char *str)
9290
static inline void initReadFuncOrNodes(PyObject *nodes, int *index, PyObject **subnodes, read_type *func, char *subalign)
9391
{
9492
TypeTreeNodeObject *node = (TypeTreeNodeObject *)PyList_GetItem(nodes, *index);
95-
uint32_t hash = hash_str(node->m_Type);
96-
*func = getReadFunction(hash, index);
93+
*func = getReadFunction(node->typehash, index);
9794
if (*func == NULL)
9895
{
9996
*subnodes = getSubNodes(nodes, index);
@@ -391,7 +388,7 @@ static PyObject *TypeTreeHelper_ReadValue(PyObject *nodes, Reader *reader, int *
391388
char align = (node->m_MetaFlag & kAlignBytesFlag) ? 1 : 0;
392389
// printf("RVa: %d\t%lld\t%s\t%s\t%d\t%d\n", *index, (reader->data - reader->dataStart), node->m_Name, node->m_Type, align, node->m_MetaFlag);
393390

394-
int hash_value = hash_str(node->m_Type);
391+
int hash_value = node->typehash;
395392
read_type func = getReadFunction(hash_value, index);
396393
if (func)
397394
{
@@ -620,10 +617,10 @@ TypeTreeNode_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
620617
self->m_ByteSize = 0;
621618
self->m_Index = 0;
622619
self->m_MetaFlag = 0;
623-
self->m_Type = NULL;
624-
self->m_Name = NULL;
625-
// self->m_Type[0] = '\0';
626-
// self->m_Name[0] = '\0';
620+
self->m_Type = PyMem_Malloc(sizeof(char));
621+
self->m_Name = PyMem_Malloc(sizeof(char));
622+
self->m_Type[0] = '\0';
623+
self->m_Name[0] = '\0';
627624
// self->children_count = 0;
628625
// self->children = NULL;
629626
self->m_TypeStrOffset = 0;
@@ -673,20 +670,66 @@ TypeTreeNode_init(TypeTreeNodeObject *self, PyObject *args, PyObject *kwds)
673670
return -1;
674671
if (type != NULL)
675672
{
673+
PyMem_Free(self->m_Type);
676674
self->m_Type = PyMem_Malloc(strlen(type) + 1);
677675
strcpy(self->m_Type, type);
676+
self->typehash = hash_str(type);
678677
}
679678
if (name != NULL)
680679
{
680+
PyMem_Free(self->m_Name);
681681
self->m_Name = PyMem_Malloc(strlen(name) + 1);
682682
strcpy(self->m_Name, name);
683683
}
684684
return 0;
685685
};
686686

687+
static PyObject *
688+
TypeTreeNode_getType(TypeTreeNodeObject *self, void *closure)
689+
{
690+
return PyUnicode_DecodeUTF8(self->m_Type, strlen(self->m_Type), SURROGATEESCAPE);
691+
}
692+
693+
static int
694+
TypeTreeNode_setType(TypeTreeNodeObject *self, PyObject *value, void *closure)
695+
{
696+
if (!PyUnicode_Check(value))
697+
{
698+
PyErr_SetString(PyExc_TypeError, "The type attribute value must be a string");
699+
return NULL;
700+
}
701+
PyMem_Free(self->m_Type);
702+
char *type = PyUnicode_AsUTF8(value);
703+
self->m_Type = PyMem_Malloc(strlen(type) + 1);
704+
strcpy(self->m_Type, type);
705+
self->typehash = hash_str(type);
706+
return 0;
707+
}
708+
709+
static PyObject *
710+
TypeTreeNode_getName(TypeTreeNodeObject *self, void *closure)
711+
{
712+
return PyUnicode_DecodeUTF8(self->m_Name, strlen(self->m_Name), SURROGATEESCAPE);
713+
}
714+
715+
static int
716+
TypeTreeNode_setName(TypeTreeNodeObject *self, PyObject *value, void *closure)
717+
{
718+
if (!PyUnicode_Check(value))
719+
{
720+
PyErr_SetString(PyExc_TypeError, "The name attribute value must be a string");
721+
return NULL;
722+
}
723+
PyMem_Free(self->m_Name);
724+
char *name = PyUnicode_AsUTF8(value);
725+
self->m_Name = PyMem_Malloc(strlen(name) + 1);
726+
strcpy(self->m_Name, name);
727+
return 0;
728+
}
729+
687730
static PyMemberDef TypeTreeNode_members[] = {
688-
{"m_Type", T_STRING, offsetof(TypeTreeNodeObject, m_Type), 0, ""},
689-
{"m_Name", T_STRING, offsetof(TypeTreeNodeObject, m_Name), 0, ""},
731+
//{"m_Type", T_STRING, offsetof(TypeTreeNodeObject, m_Type), 0, ""},
732+
//{"m_Name", T_STRING, offsetof(TypeTreeNodeObject, m_Name), 0, ""},
690733
{"m_ByteSize", T_INT, offsetof(TypeTreeNodeObject, m_ByteSize), 0, ""},
691734
{"m_Index", T_INT, offsetof(TypeTreeNodeObject, m_Index), 0, ""},
692735
{"m_IsArray", T_BOOL, offsetof(TypeTreeNodeObject, m_IsArray), 0, ""},
@@ -700,6 +743,14 @@ static PyMemberDef TypeTreeNode_members[] = {
700743
{NULL} /* Sentinel */
701744
};
702745

746+
static PyGetSetDef TypeTreeNode_getsetters[] = {
747+
{"m_Type", (getter)TypeTreeNode_getType, (setter)TypeTreeNode_setType,
748+
"", NULL},
749+
{"m_Name", (getter)TypeTreeNode_getName, (setter)TypeTreeNode_setName,
750+
"", NULL},
751+
{NULL} /* Sentinel */
752+
};
753+
703754
static PyObject *
704755
TypeTreeNode_repr(PyObject *self)
705756
{
@@ -708,8 +759,7 @@ TypeTreeNode_repr(PyObject *self)
708759
"<TypeTreeNode %d %s %s>",
709760
node->m_Level,
710761
node->m_Type,
711-
node->m_Name
712-
);
762+
node->m_Name);
713763
}
714764

715765
// PyTypeObject TypeTreeNodeType;
@@ -766,6 +816,7 @@ PyTypeObject TypeTreeNodeType = {
766816
.tp_init = (initproc)TypeTreeNode_init,
767817
.tp_dealloc = (destructor)TypeTreeNode_dealloc,
768818
.tp_members = TypeTreeNode_members,
819+
.tp_getset = TypeTreeNode_getsetters,
769820
.tp_repr = (reprfunc)TypeTreeNode_repr,
770821
};
771822

‎UnityPyBoost/TypeTreeHelper.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ typedef struct TypeTreeNodeObject{
2222
unsigned long long m_RefTypeHash;
2323
// UnityRaw - versin = 2
2424
int m_VariableCount;
25+
// helper fields
26+
unsigned int typehash;
2527
} TypeTreeNodeObject;
2628

2729
int add_typetreenode_to_module(PyObject *m);

‎examples/MonoBehaviourFromAssembly/monobehaviour_from_assembly.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def export_monobehaviours(asset_path: str, trees: dict):
4747
for obj in env.objects:
4848
if obj.type == "MonoBehaviour":
4949
d = obj.read()
50-
if obj.serialized_type.nodes:
50+
if obj.serialized_type and obj.serialized_type.nodes:
5151
tree = obj.read_typetree()
5252
else:
5353
if not d.m_Script:

0 commit comments

Comments
 (0)