else if(!*s)
sprintf(string, "[%s]\"\"", access, s);
else
- sprintf(string, "[%s]", access, s);
-
+ sprintf(string, "[%s]%s", access, s);
free(s);
return string;
}
strcat(mname,s);
free(s);
} else {
- fprintf(stderr, "Invalid multiname type: %02x\n", m->type);
+ return strdup("<invalid>");
}
free(name);
return mname;
const array_entry_t*c2 = _c2;
return c2->data - c1->data;
}
+
+static void* nodup(const void*o) {return (void*)o;}
+
static void reshuffle_array(array_t*array)
{
qsort(array->d+1, array->num-1, sizeof(array->d[0]), compare_arrayentry);
- dict_t*d = dict_new2(array->entry2pos->key_type);
+ type_t* old_type = array->entry2pos->key_type;
+ type_t old_type_nodup = *old_type;
+ old_type_nodup.dup = nodup;
+ dict_t*d = dict_new2(&old_type_nodup);
dict_destroy_shallow(array->entry2pos);
array->entry2pos = d;
int t;
for(t=0;t<array->num;t++) {
dict_put(array->entry2pos, array->d[t].name, (void*)(ptroff_t)(t+1));
}
+ d->key_type = old_type;
+
}
// ------------------------------- pool -------------------------------------
for(t=1;t<num_multinames;t++) {
multiname_t m;
memset(&m, 0, sizeof(multiname_t));
+
+ /*int s;
+ for(s=0;s<8;s++)
+ printf("0x%02x ", tag->data[tag->pos+s]);
+ printf("\n");*/
+
m.type = swf_GetU8(tag);
if(m.type==0x07 || m.type==0x0d) {
int namespace_index = swf_GetU30(tag);
} else if(m.type==0x1b || m.type==0x1c) {
int namespace_set_index = swf_GetU30(tag);
m.namespace_set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, namespace_set_index);
+ } else if(m.type==0x1d) {
+ int v1 = swf_GetU30(tag);
+ int v2 = swf_GetU30(tag);
+ int v3 = swf_GetU30(tag);
+ //printf("%02x %02x %02x\n", v1, v2, v3);
+ m.type = 0x07;
+ m.namespace_set = 0;
+ m.name = pool_lookup_string(pool, v1);
+ m.ns = pool_lookup_namespace(pool, v2);
+ /* not sure what to do with v3-
+ it's definitely not a namespace */
} else {
printf("can't parse type %d multinames yet\n", m.type);
}
void pool_dump(pool_t*pool, FILE*fo, char flags)
{
int t;
- fprintf(fo, "%d integers:\n", pool->x_ints->num);
+ fprintf(fo, "%d integers\n", pool->x_ints->num);
for(t=1;t<pool->x_ints->num;t++) {
S32 val = *(int*)array_getkey(pool->x_ints, t);
int freq = (int)(ptroff_t)array_getvalue(pool->x_ints, t);
if(flags&1) fprintf(fo, "%5d %d) %d\n", freq, t, val);
}
- fprintf(fo, "%d unsigned integers:\n", pool->x_uints->num);
+ fprintf(fo, "%d unsigned integers\n", pool->x_uints->num);
for(t=1;t<pool->x_uints->num;t++) {
U32 val = *(unsigned int*)array_getkey(pool->x_uints, t);
int freq = (int)(ptroff_t)array_getvalue(pool->x_uints, t);
if(flags&1) fprintf(fo, "%5d %d) %d\n", freq, t, val);
}
- fprintf(fo, "%d floats:\n", pool->x_floats->num);
+ fprintf(fo, "%d floats\n", pool->x_floats->num);
for(t=1;t<pool->x_floats->num;t++) {
double d = pool_lookup_float(pool, t);
int freq = (int)(ptroff_t)array_getvalue(pool->x_floats, t);
if(flags&2) fprintf(fo, "%5d %d) %f\n", freq, t, d);
}
- fprintf(fo, "%d strings:\n", pool->x_strings->num);
+ fprintf(fo, "%d strings\n", pool->x_strings->num);
for(t=1;t<pool->x_strings->num;t++) {
string_t str = pool_lookup_string2(pool, t);
int freq = (int)(ptroff_t)array_getvalue(pool->x_strings, t);
if(flags&1) fwrite(str.str, str.len, 1, fo);
if(flags&1) fprintf(fo, "\n", t);
}
- fprintf(fo, "%d namespaces:\n", pool->x_namespaces->num);
+ fprintf(fo, "%d namespaces\n", pool->x_namespaces->num);
for(t=1;t<pool->x_namespaces->num;t++) {
namespace_t*ns= (namespace_t*)array_getkey(pool->x_namespaces, t);
char*s = namespace_tostring(ns);
if(flags&1) fprintf(fo, "%5d %d) %s\n", freq, t, s);
free(s);
}
- fprintf(fo, "%d namespace sets:\n", pool->x_namespace_sets->num);
+ fprintf(fo, "%d namespace sets\n", pool->x_namespace_sets->num);
for(t=1;t<pool->x_namespace_sets->num;t++) {
namespace_set_t*set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, t);
char*s = namespace_set_tostring(set);
free(s);
}
- fprintf(fo, "%d multinames:\n", pool->x_multinames->num);
+ fprintf(fo, "%d multinames\n", pool->x_multinames->num);
for(t=1;t<pool->x_multinames->num;t++) {
multiname_t*m = (multiname_t*)array_getkey(pool->x_multinames, t);
char*s = multiname_tostring(m);