X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=f2c33539ccf637709607994c32a689320308155c;hb=2e95c146b14d49cf874568e51148377b50c9c5e8;hp=65ad5d61b721de2082f49891f8f1fc5030fabfc2;hpb=30b20cd943352f06653708f8d7e0d687ebdefbf7;p=swftools.git diff --git a/src/swfdump.c b/src/swfdump.c index 65ad5d6..f2c3353 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" @@ -33,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[] = { @@ -48,6 +51,7 @@ struct options_t options[] = {"Y","height"}, {"r","rate"}, {"e","html"}, + {"u","used"}, {"v","verbose"}, {"V","version"}, {"d","hex"}, @@ -89,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); } @@ -110,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) @@ -216,17 +225,17 @@ 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); else @@ -356,10 +365,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; @@ -374,6 +396,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); @@ -401,9 +424,10 @@ 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 && !swf.compressed) + dumperror("Real Filesize (%d) doesn't match header Filesize (%d)", + statbuf.st_size, swf.fileSize); + filesize = statbuf.st_size; #endif close(f); @@ -449,7 +473,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); @@ -469,41 +500,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; @@ -552,7 +606,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; @@ -561,8 +615,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; @@ -581,12 +636,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;tpos = used[t]; + printf("%d%s", swf_GetU16(tag), tlen && 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 && ((t&15)==15)) || (t==tag->len-1)) { if(t==tag->len-1) printf("\n"); @@ -596,6 +668,7 @@ int main (int argc,char ** argv) } } tag = tag->next; + fflush(stdout); } swf_FreeTags(&swf);