X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=036321808ca74668f103da96f33560cce7eee9cd;hb=7be64767e7b09e1d331d30450811a8af82978ee6;hp=f01cfad03440e332d036d742b6fe2c799184346b;hpb=ad6901fa76173f54caf313f4e2122a2e860b72c1;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index f01cfad..0363218 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -38,6 +38,7 @@ int action = 0;
 int html = 0;
 int xy = 0;
 int showtext = 0;
+int hex = 0;
 
 struct options_t options[] =
 {
@@ -49,6 +50,7 @@ struct options_t options[] =
  {"e","html"},
  {"v","verbose"},
  {"V","version"},
+ {"d","hex"},
  {0,0}
 };
 
@@ -83,6 +85,10 @@ int args_callback_option(char*name,char*val)
 	xy |= 4;
 	return 0;
     }
+    else if(name[0]=='d') {
+	hex = 1;
+	return 0;
+    }
     else {
         printf("Unknown option: -%s\n", name);
     }
@@ -96,14 +102,15 @@ int args_callback_longoption(char*name,char*val)
 void args_callback_usage(char*name)
 {    
     printf("Usage: %s [-at] file.swf\n", name);
-    printf("\t-h , --help\t\t\t Print help and exit\n");
-    printf("\t-e , --html\t\t\t Create a html embedding the file (simple, but useful)\n");
-    printf("\t-X , --width\t\t\t Prints out a string of the form \"-X width\"\n");
-    printf("\t-Y , --height\t\t\t Prints out a string of the form \"-Y height\"\n");
-    printf("\t-r , --rate\t\t\t Prints out a string of the form \"-r rate\"\n");
-    printf("\t-a , --action\t\t\t Disassemble action tags\n");
-    printf("\t-t , --text\t\t\t Show text data\n");
-    printf("\t-V , --version\t\t\t Print program version and exit\n");
+    printf("\t-h , --help\t\t Print help and exit\n");
+    printf("\t-e , --html\t\t Create a html embedding the file (simple, but useful)\n");
+    printf("\t-X , --width\t\t Prints out a string of the form \"-X width\"\n");
+    printf("\t-Y , --height\t\t Prints out a string of the form \"-Y height\"\n");
+    printf("\t-r , --rate\t\t Prints out a string of the form \"-r rate\"\n");
+    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-V , --version\t\t Print program version and exit\n");
 }
 int args_callback_command(char*name,char*val)
 {
@@ -142,12 +149,15 @@ void dumpButton2Actions(TAG*tag, char*prefix)
     { swf_GetU16(tag);          // id
       swf_GetU16(tag);          // layer
       swf_GetMatrix(tag,NULL);  // matrix
-      swf_GetCXForm(tag,NULL,1);  // matrix
+      swf_GetCXForm(tag,NULL,1);  // cxform
     }
 
     while(offsetpos)
     { U8 a;
       ActionTAG*actions;
+
+      if(tag->pos >= tag->len)
+	  break;
         
       offsetpos = swf_GetU16(tag);
       condition = swf_GetU16(tag);                // condition
@@ -280,6 +290,66 @@ void handleEditText(TAG*tag)
    //  printf(" text \"%s\"\n", &tag->data[tag->pos])
 	;
 }
+void printhandlerflags(U16 handlerflags) 
+{
+    if(handlerflags&1) printf("[on load]");
+    if(handlerflags&2) printf("[enter frame]");
+    if(handlerflags&4) printf("[unload]");
+    if(handlerflags&8) printf("[mouse move]");
+    if(handlerflags&16) printf("[mouse down]");
+    if(handlerflags&32) printf("[mouse up]");
+    if(handlerflags&64) printf("[key down]");
+    if(handlerflags&128) printf("[key up]");
+    if(handlerflags&256) printf("[data]");
+    if(handlerflags&0xfe00) printf("[???]");
+}
+void handlePlaceObject2(TAG*tag, char*prefix)
+{
+    U8 flags = swf_GetU8(tag);
+    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&16) swf_GetU16(tag); //ratio
+    if(flags&32) { 
+	while(swf_GetU8(tag));
+    }
+    if(flags&64) swf_GetU16(tag); //clip
+    if(flags&128) {
+      if (action) {
+	U16 globalflags;
+	U16 unknown;
+	printf("\n");
+	unknown = swf_GetU16(tag);
+	globalflags = swf_GetU16(tag);
+	if(unknown)
+	    printf("Unknown parameter field not zero: %04x\n", unknown);
+	while(1)  {
+	    int length;
+	    int t;
+	    U16 handlerflags;
+	    ActionTAG*a;
+	    handlerflags = swf_GetU16(tag);
+	    if(!handlerflags)
+		break;
+	    globalflags &= ~handlerflags;
+	    printf("%s flags %04x ",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);
+	}
+	if(globalflags) // should go to sterr.
+	    printf("ERROR: unsatisfied handlerflags: %02x\n", globalflags);
+    } else {
+      printf(" has action code\n");
+    }
+    } else printf("\n");
+}
     
 void fontcallback1(U16 id,U8 * name)
 { fontnum++;
@@ -404,6 +474,11 @@ int main (int argc,char ** argv)
             continue;
         }
         printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
+	
+	if(tag->id == ST_FREECHARACTER) {
+	    U16 id = swf_GetU16(tag);
+	    idtab[id] = 0;
+	}
 
         if(swf_isDefiningTag(tag)) {
             U16 id = swf_GetDefineID(tag);
@@ -412,6 +487,12 @@ int main (int argc,char ** argv)
                 fprintf(stderr, "Error: Id %04x is defined more than once.\n", id);
             idtab[id] = 1;
         }
+	else if(swf_isPseudoDefiningTag(tag)) {
+            U16 id = swf_GetDefineID(tag);
+            printf(" adds information to id %04x", id);
+            if(!idtab[id])
+                fprintf(stderr, "Error: Id %04x is not yet defined.\n", id);
+	}
         else if(tag->id == ST_PLACEOBJECT || 
                 tag->id == ST_PLACEOBJECT2) {
             printf(" places id %04x at depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag));
@@ -435,7 +516,20 @@ int main (int argc,char ** argv)
 	}
 	else if(tag->id == ST_SHOWFRAME) {
 	    char*label = issprite?spriteframelabel:framelabel;
-	    printf(" %d", issprite?spriteframe:mainframe);
+	    int frame = issprite?spriteframe:mainframe;
+	    int nframe = frame;
+	    if(!label) {
+		while(tag->next && tag->next->id == ST_SHOWFRAME && tag->next->len == 0) {
+		    tag = tag->next;
+		    if(issprite) spriteframe++;
+		    else mainframe++;
+		    nframe++;
+		}
+	    }
+	    if(nframe == frame)
+		printf(" %d", frame);
+	    else
+		printf(" %d-%d", frame, nframe);
 	    if(label)
 		printf(" (label \"%s\")", label);
 	    if(issprite) {spriteframe++; spriteframelabel = 0;}
@@ -447,7 +541,12 @@ int main (int argc,char ** argv)
 	    printf("\n");
 	}
 	else if(tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) {
-	    handleText(tag);
+	    if(showtext)
+		handleText(tag);
+	    else
+		printf("\n");
+	}
+	else if(tag->id == ST_PLACEOBJECT2) {
 	}
 	else {
 	    printf("\n");
@@ -481,6 +580,26 @@ int main (int argc,char ** argv)
 	else if(tag->id == ST_DEFINEBUTTON2 && action) {
 	    dumpButton2Actions(tag, myprefix);
 	}
+	else if(tag->id == ST_PLACEOBJECT2) {
+	    if((*(U8*)tag->data)&0x80)
+		handlePlaceObject2(tag, myprefix);
+	    else
+		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==tag->len-1)
+			printf("\n");
+		    else
+			printf("\n                %s-=> ",prefix);
+		}
+	    }
+	}
         tag = tag->next;
     }
 
@@ -488,3 +607,4 @@ int main (int argc,char ** argv)
     return 0;
 }
 
+