X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=a6c0f78e1c26e005370dafecd62fd38c7a126459;hb=892f39ec51f296d33ffa8dead43d65631eeabd1f;hp=e70a425d563fef757070ed97ac018276cd0029a3;hpb=e9fc8c3b319a6575a53a58a1b672a6956de05117;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index e70a425..a6c0f78 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -34,12 +34,14 @@ char * filename = 0;
    to detect errors in the file. (i.e. ids which are defined more than 
    once */
 char idtab[65536];
+char * indent = "                ";
 
 int action = 0;
 int html = 0;
 int xy = 0;
 int showtext = 0;
 int hex = 0;
+int used = 0;
 
 struct options_t options[] =
 {
@@ -49,6 +51,7 @@ struct options_t options[] =
  {"Y","height"},
  {"r","rate"},
  {"e","html"},
+ {"u","used"},
  {"v","verbose"},
  {"V","version"},
  {"d","hex"},
@@ -90,6 +93,10 @@ int args_callback_option(char*name,char*val)
 	hex = 1;
 	return 0;
     }
+    else if(name[0]=='u') {
+	used = 1;
+	return 0;
+    }
     else {
         printf("Unknown option: -%s\n", name);
     }
@@ -111,6 +118,7 @@ void args_callback_usage(char*name)
     printf("\t-a , --action\t\t Disassemble action tags\n");
     printf("\t-t , --text\t\t Show text data\n");
     printf("\t-d , --hex\t\t Print hex output of tag data, too\n");
+    printf("\t-u , --used\t\t Show referred IDs for each Tag\n");
     printf("\t-V , --version\t\t Print program version and exit\n");
 }
 int args_callback_command(char*name,char*val)
@@ -229,7 +237,7 @@ void textcallback(int*glyphs, int nr, int fontid)
 	    a = glyphs[t];
 	}
 	if(a>=32)
-	    printf("%c", a,a);
+	    printf("%c", a);
 	else
 	    printf("\\x%x", (int)a);
     }
@@ -307,42 +315,49 @@ void printhandlerflags(U16 handlerflags)
 void handlePlaceObject2(TAG*tag, char*prefix)
 {
     U8 flags = swf_GetU8(tag);
+    printf("flags: %02x", flags);
     swf_GetU16(tag); //depth
     //flags&1: move
     if(flags&2) swf_GetU16(tag); //id
     if(flags&4) swf_GetMatrix(tag,0);
-    if(flags&8) swf_GetCXForm(tag,0,0);
+    if(flags&8) swf_GetCXForm(tag,0,1);
     if(flags&16) swf_GetU16(tag); //ratio
-    if(flags&32) { 
-	while(swf_GetU8(tag));
-    }
+    if(flags&32) { while(swf_GetU8(tag)); }
     if(flags&64) swf_GetU16(tag); //clip
     if(flags&128) {
       if (action) {
-	U16 globalflags;
 	U16 unknown;
+	U32 globalflags;
+	U32 handlerflags;
+	char is32 = 0;
 	printf("\n");
 	unknown = swf_GetU16(tag);
 	globalflags = swf_GetU16(tag);
-	if(unknown)
+	if(unknown) {
 	    printf("Unknown parameter field not zero: %04x\n", unknown);
-	while(1)  {
+	    return;
+	}
+	printf("global flags: %04x\n", globalflags);
+	handlerflags = swf_GetU16(tag);
+	if(!handlerflags) {
+	    handlerflags = swf_GetU32(tag);
+	    is32 = 1;
+	}
+	while(handlerflags)  {
 	    int length;
 	    int t;
-	    U16 handlerflags;
 	    ActionTAG*a;
-	    handlerflags = swf_GetU16(tag);
-	    if(!handlerflags)
-		break;
+
 	    globalflags &= ~handlerflags;
-	    printf("%s flags %04x ",prefix, handlerflags);
+	    printf("%s flags %08x ",prefix, handlerflags);
 	    printhandlerflags(handlerflags);
-
 	    length = swf_GetU32(tag);
 	    printf(", %d bytes actioncode\n",length);
 	    a = swf_ActionGet(tag);
 	    swf_DumpActions(a,prefix);
 	    swf_ActionFree(a);
+
+	    handlerflags = is32?swf_GetU32(tag):swf_GetU16(tag);
 	}
 	if(globalflags) // should go to sterr.
 	    printf("ERROR: unsatisfied handlerflags: %02x\n", globalflags);
@@ -388,6 +403,7 @@ int main (int argc,char ** argv)
     char* spriteframelabel;
     char* framelabel = 0;
     char prefix[128];
+    int filesize = 0;
     prefix[0] = 0;
     memset(idtab,0,65536);
 
@@ -415,9 +431,10 @@ int main (int argc,char ** argv)
 
 #ifdef HAVE_STAT
     fstat(f, &statbuf);
-    if(statbuf.st_size != swf.fileSize)
+    if(statbuf.st_size != swf.fileSize && !swf.compressed)
         dumperror("Real Filesize (%d) doesn't match header Filesize (%d)",
                 statbuf.st_size, swf.fileSize);
+    filesize = statbuf.st_size;
 #endif
 
     close(f);
@@ -463,7 +480,14 @@ int main (int argc,char ** argv)
 	return 0;
     } 
     printf("[HEADER]        File version: %d\n", swf.fileVersion);
-    printf("[HEADER]        File size: %ld\n", swf.fileSize);
+    if(swf.compressed) {
+	printf("[HEADER]        File is zlib compressed.");
+	if(filesize && swf.fileSize)
+	    printf(" Ratio: %02d%%\n", filesize*100/(swf.fileSize));
+	else
+	    printf("\n");
+    }
+    printf("[HEADER]        File size: %ld%s\n", swf.fileSize, swf.compressed?" (Depacked)":"");
     printf("[HEADER]        Frame rate: %f\n",swf.frameRate/256.0);
     printf("[HEADER]        Frame count: %d\n",swf.frameCount);
     printf("[HEADER]        Movie width: %.3f\n",(swf.movieSize.xmax-swf.movieSize.xmin)/20.0);
@@ -537,7 +561,13 @@ int main (int argc,char ** argv)
 	    printf(" starts id %04d", swf_GetPlaceID(tag));
 	}
 	else if(tag->id == ST_FRAMELABEL) {
+	    int l = strlen(tag->data);
 	    printf(" \"%s\"", tag->data);
+	    if(l < tag->len-1) {
+		printf(" has %d extra bytes", tag->len-1-l);
+		if(tag ->len-1-l == 1 && tag->data[tag->len-1] == 1)
+		    printf(" (ANCHOR)");
+	    }
 	    if((framelabel && !issprite) ||
 	       (spriteframelabel && issprite)) {
 		dumperror("Frame %d has more than one label", 
@@ -619,12 +649,29 @@ int main (int argc,char ** argv)
 	    else
 		printf("\n");
 	}
+
+	if(tag->len && used) {
+	    int num = swf_GetNumUsedIDs(tag);
+	    int* used;
+	    int t;
+	    if(num) {
+		used = (int*)malloc(sizeof(int)*num);
+		swf_GetUsedIDs(tag, used);
+		printf("%s%suses IDs: ", indent, prefix);
+		for(t=0;t<num;t++) {
+		    tag->pos = used[t];
+		    printf("%d%s", swf_GetU16(tag), t<num-1?", ":"");
+		}
+		printf("\n");
+	    }
+	}
+
 	if(tag->len && hex) {
 	    int t;
 	    printf("                %s-=> ",prefix);
 	    for(t=0;t<tag->len;t++) {
 		printf("%02x ", tag->data[t]);
-		if((t && !(t&15)) || (t==tag->len-1))
+		if((t && ((t&15)==15)) || (t==tag->len-1))
 		{
 		    if(t==tag->len-1)
 			printf("\n");