handle FREECHARACTER tags.

[swftools.git] / src / swfdump.c

diff --git a/src/swfdump.c b/src/swfdump.c
index 418a19a..0363218 100644 (file)
--- 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)
 {
@@ -299,6 +306,8 @@ void printhandlerflags(U16 handlerflags)
 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);
@@ -308,30 +317,38 @@ void handlePlaceObject2(TAG*tag, char*prefix)
     }
     if(flags&64) swf_GetU16(tag); //clip
     if(flags&128) {
-       U8 handlerflags;
-       swf_GetU16(tag);
-       handlerflags = swf_GetU16(tag);
-       printf("%s global flags:%04x ",prefix, handlerflags);
-       printhandlerflags(handlerflags);
+      if (action) {
+       U16 globalflags;
+       U16 unknown;
        printf("\n");
-       while(1) {
+       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;
-           printf("%s flags:%04x ",prefix, handlerflags);
+           globalflags &= ~handlerflags;
+           printf("%s flags %04x ",prefix, handlerflags);
            printhandlerflags(handlerflags);
 
-           printf("\n");
            length = swf_GetU32(tag);
-           printf("%s %d bytes actioncode\n",prefix);
+           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)
@@ -457,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);
@@ -494,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;}
@@ -511,6 +546,8 @@ int main (int argc,char ** argv)
            else
                printf("\n");
        }
+       else if(tag->id == ST_PLACEOBJECT2) {
+       }
        else {
            printf("\n");
        }
@@ -544,8 +581,24 @@ int main (int argc,char ** argv)
            dumpButton2Actions(tag, myprefix);
        }
        else if(tag->id == ST_PLACEOBJECT2) {
-           if((*(U8*)tag->data)&0x80) 
-           handlePlaceObject2(tag, myprefix);
+           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;
     }