X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=7e11e1c94f07fbfb830916f89c572f47676767bc;hp=59aa8804f97c403f934d4ef56b1cc288648c43f5;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=639ac6b9f7a89f10d02c5d9ef41bca3bad4eaf2b

diff --git a/lib/as3/abc.c b/lib/as3/abc.c
index 59aa880..7e11e1c 100644
--- a/lib/as3/abc.c
+++ b/lib/as3/abc.c
@@ -26,6 +26,7 @@
 #include "../rfxswf.h"
 #include "../q.h"
 #include "abc.h"
+#include "assets.h"
 
 char stringbuffer[2048];
 
@@ -49,12 +50,12 @@ static void params_dump(FILE*fo, multiname_list_t*l, constant_list_t*o)
     fprintf(fo, "(");
     while(l) {
         char*s = multiname_tostring(l->multiname);
-        fprintf(fo, s);
+        fprintf(fo, "%s", s);
         free(s);
         if(i>=n-no) {
             s = constant_tostring(o->constant);
             fprintf(fo, " = ");
-            fprintf(fo, s);
+            fprintf(fo, "%s", s);
             free(s);
             o = o->next;
         }
@@ -74,7 +75,7 @@ static void parse_metadata(TAG*tag, abc_file_t*file, pool_t*pool)
     int t;
     int num_metadata = swf_GetU30(tag);
 
-    DEBUG printf("%d metadata\n");
+    DEBUG printf("%d metadata\n", num_metadata);
     for(t=0;t<num_metadata;t++) {
         const char*entry_name = pool_lookup_string(pool, swf_GetU30(tag));
         int num = swf_GetU30(tag);
@@ -157,6 +158,20 @@ void abc_class_add_interface(abc_class_t*c, multiname_t*interface)
 {
     list_append(c->interfaces, multiname_clone(interface));
 }
+char*abc_class_fullname(abc_class_t*cls)
+{
+    const char*package = cls->classname->ns->name;
+    const char*name = cls->classname->name;
+    int l1 = strlen(package);
+    int l2 = strlen(name);
+    char*fullname = malloc(l1+l2+2);
+    if(l1) {
+	memcpy(fullname, package, l1);
+	fullname[l1++]='.';
+    }
+    memcpy(fullname+l1, name, l2+1);
+    return fullname;
+}
 
 void abc_method_init(abc_method_t*m, abc_file_t*file, multiname_t*returntype, char body)
 {
@@ -451,7 +466,7 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
 	} else if(kind == TRAIT_CLASS) { // class
 	    trait->slot_id = swf_GetU30(tag);
 	    trait->cls = (abc_class_t*)array_getvalue(file->classes, swf_GetU30(tag));
-	    DEBUG printf("  class %s %d %d\n", name, trait->slot_id, trait->cls);
+	    DEBUG printf("  class %s %d %08x\n", name, trait->slot_id, (int)trait->cls);
 	} else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
 	    trait->slot_id = swf_GetU30(tag);
             trait->type_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
@@ -620,7 +635,7 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix)
         int s;
         array_t*items = (array_t*)array_getvalue(file->metadata, t);
         for(s=0;s<items->num;s++) {
-            fprintf(fo, "%s#  %s=%s\n", prefix, array_getkey(items, s), array_getvalue(items,s));
+            fprintf(fo, "%s#  %s=%s\n", prefix, (char*)array_getkey(items, s), (char*)array_getvalue(items,s));
         }
         fprintf(fo, "%s#\n", prefix);
     }
@@ -678,6 +693,11 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix)
 	    dump_method(fo, prefix2, "", "constructor", n, cls->constructor, file, methods_seen);
         free(n);
 	traits_dump(fo, prefix2,cls->traits, file, methods_seen);
+
+	if(cls->asset) {
+	    swf_DumpAsset(fo, cls->asset, prefix2);
+	}
+
         fprintf(fo, "%s}\n", prefix);
     }
     fprintf(fo, "%s\n", prefix);
@@ -755,9 +775,9 @@ void* swf_ReadABC(TAG*tag)
 
 	m->flags = swf_GetU8(tag);
 	
-        DEBUG printf("method %d) %s ", m->name);
+        DEBUG printf("method %d) %s ", t, m->name);
         DEBUG params_dump(stdout, m->parameters, m->optional_parameters);
-        DEBUG printf("flags=%02x\n", t, m->flags);
+        DEBUG printf("flags=%02x\n", m->flags);
 
         if(m->flags&0x08) {
             m->optional_parameters = list_new();