X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=e70a425d563fef757070ed97ac018276cd0029a3;hb=e9fc8c3b319a6575a53a58a1b672a6956de05117;hp=95c57d698eeeafee3b552ee5ff18ead3c81f1b1a;hpb=39065f2cd792d02b67e8c235c68d824b988a94e4;p=swftools.git diff --git a/src/swfdump.c b/src/swfdump.c index 95c57d6..e70a425 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -7,7 +7,7 @@ This file is distributed under the GPL, see file COPYING for details */ -#define HAVE_STAT +#include "../config.h" #ifdef HAVE_SYS_STAT_H #include @@ -24,6 +24,7 @@ #include #include #include +#include #include "../lib/rfxswf.h" #include "../lib/args.h" @@ -38,6 +39,7 @@ int action = 0; int html = 0; int xy = 0; int showtext = 0; +int hex = 0; struct options_t options[] = { @@ -49,6 +51,7 @@ struct options_t options[] = {"e","html"}, {"v","verbose"}, {"V","version"}, + {"d","hex"}, {0,0} }; @@ -83,6 +86,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); } @@ -103,6 +110,7 @@ void args_callback_usage(char*name) 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) @@ -209,19 +217,19 @@ void textcallback(int*glyphs, int nr, int fontid) break; } } - if(font<0) { - printf("\n"); - return; // todo: should we report this? (may only be that it's a definefont without fontinfo) - } for(t=0;t= fonts[font]->numchars) - continue; - a = fonts[font]->glyph2ascii[glyphs[t]]; + if(font>=0) { + if(glyphs[t] >= fonts[font]->numchars) + continue; + a = fonts[font]->glyph2ascii[glyphs[t]]; + } else { + a = glyphs[t]; + } if(a>=32) - printf("%c", a); + printf("%c", a,a); else printf("\\x%x", (int)a); } @@ -299,6 +307,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); @@ -310,12 +320,12 @@ void handlePlaceObject2(TAG*tag, char*prefix) if(flags&128) { if (action) { U16 globalflags; + U16 unknown; printf("\n"); - swf_GetU16(tag); + unknown = swf_GetU16(tag); globalflags = swf_GetU16(tag); -// printf("%s global flags:%04x ",prefix, handlerflags); -// printhandlerflags(globalflags); -// printf("\n"); + if(unknown) + printf("Unknown parameter field not zero: %04x\n", unknown); while(1) { int length; int t; @@ -335,7 +345,7 @@ void handlePlaceObject2(TAG*tag, char*prefix) swf_ActionFree(a); } if(globalflags) // should go to sterr. - printf("%s ERROR: unsatisfied handlerflags: %02x", globalflags); + printf("ERROR: unsatisfied handlerflags: %02x\n", globalflags); } else { printf(" has action code\n"); } @@ -347,10 +357,23 @@ void fontcallback1(U16 id,U8 * name) } void fontcallback2(U16 id,U8 * name) -{ swf_FontExtract(&swf,id,&fonts[fontnum]); +{ + swf_FontExtract(&swf,id,&fonts[fontnum]); fontnum++; } +void dumperror(const char* format, ...) +{ + char buf[1024]; + va_list arglist; + + va_start(arglist, format); + vsprintf(buf, format, arglist); + va_end(arglist); + + printf("==== Error: %s ====\n", buf); +} + int main (int argc,char ** argv) { TAG*tag; @@ -392,9 +415,9 @@ int main (int argc,char ** argv) #ifdef HAVE_STAT fstat(f, &statbuf); - if(statbuf.st_size != swf.FileSize) - fprintf(stderr, "Error: Real Filesize (%d) doesn't match header Filesize (%d)", - statbuf.st_size, swf.FileSize); + if(statbuf.st_size != swf.fileSize) + dumperror("Real Filesize (%d) doesn't match header Filesize (%d)", + statbuf.st_size, swf.fileSize); #endif close(f); @@ -460,41 +483,64 @@ int main (int argc,char ** argv) char*name = swf_TagGetName(tag); char myprefix[128]; if(!name) { - fprintf(stderr, "Error: Unknown tag:0x%03x\n", tag->id); + dumperror("Unknown tag:0x%03x", tag->id); tag = tag->next; 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); - printf(" defines id %04x", id); + printf(" defines id %04d", id); if(idtab[id]) - fprintf(stderr, "Error: Id %04x is defined more than once.\n", id); + dumperror("Id %04d is defined more than once.", id); idtab[id] = 1; } else if(swf_isPseudoDefiningTag(tag)) { U16 id = swf_GetDefineID(tag); - printf(" adds information to id %04x", id); + printf(" adds information to id %04d", id); if(!idtab[id]) - fprintf(stderr, "Error: Id %04x is not yet defined.\n", id); + dumperror("Id %04d 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)); + else if(tag->id == ST_PLACEOBJECT) { + printf(" places id %04d at depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag)); if(swf_GetName(tag)) printf(" name \"%s\"",swf_GetName(tag)); } + else if(tag->id == ST_PLACEOBJECT2) { + if(tag->data[0]&1) + printf(" moves"); + else + printf(" places"); + + if(tag->data[0]&2) + printf(" id %04d",swf_GetPlaceID(tag)); + else + printf(" object"); + + printf(" at depth %04d", swf_GetDepth(tag)); + if(swf_GetName(tag)) + printf(" name \"%s\"",swf_GetName(tag)); + } else if(tag->id == ST_REMOVEOBJECT) { - printf(" removes id %04x from depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag)); + printf(" removes id %04d from depth %04d", swf_GetPlaceID(tag), swf_GetDepth(tag)); } else if(tag->id == ST_REMOVEOBJECT2) { - printf(" removes object from depth %04x", swf_GetDepth(tag)); + printf(" removes object from depth %04d", swf_GetDepth(tag)); } + else if(tag->id == ST_STARTSOUND) { + printf(" starts id %04d", swf_GetPlaceID(tag)); + } else if(tag->id == ST_FRAMELABEL) { printf(" \"%s\"", tag->data); - if(framelabel) { - fprintf(stderr, "Error: Frame %d has more than one label\n", + if((framelabel && !issprite) || + (spriteframelabel && issprite)) { + dumperror("Frame %d has more than one label", issprite?spriteframe:mainframe); } if(issprite) spriteframelabel = tag->data; @@ -543,7 +589,7 @@ int main (int argc,char ** argv) if(tag->id == ST_DEFINESPRITE) { sprintf(prefix, " "); if(issprite) { - fprintf(stderr, "Error: Sprite definition inside a sprite definition"); + dumperror("Sprite definition inside a sprite definition"); } issprite = 1; spriteframe = 0; @@ -552,8 +598,9 @@ int main (int argc,char ** argv) else if(tag->id == ST_END) { *prefix = 0; issprite = 0; + spriteframelabel = 0; if(tag->len) - fprintf(stderr, "Error: End Tag not empty"); + dumperror("End Tag not empty"); } else if(tag->id == ST_DOACTION && action) { ActionTAG*actions; @@ -572,7 +619,22 @@ int main (int argc,char ** argv) else printf("\n"); } + if(tag->len && hex) { + int t; + printf(" %s-=> ",prefix); + for(t=0;tlen;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; + fflush(stdout); } swf_FreeTags(&swf);