X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfdump.c;h=05b28656a549ca0234595bb9c9b8306d96b9b7ea;hp=95c57d698eeeafee3b552ee5ff18ead3c81f1b1a;hb=f7555c9f25b9008e1996e029f83ebeaaafd95321;hpb=39065f2cd792d02b67e8c235c68d824b988a94e4 diff --git a/src/swfdump.c b/src/swfdump.c index 95c57d6..05b2865 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -4,10 +4,22 @@ Part of the swftools package. Copyright (c) 2001 Matthias Kramm + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This file is distributed under the GPL, see file COPYING for details */ + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -#define HAVE_STAT + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" #ifdef HAVE_SYS_STAT_H #include @@ -24,35 +36,43 @@ #include #include #include +#include #include "../lib/rfxswf.h" #include "../lib/args.h" -char * filename = 0; +static char * filename = 0; /* idtab stores the ids which are defined in the file. This allows us to detect errors in the file. (i.e. ids which are defined more than once */ -char idtab[65536]; - -int action = 0; -int html = 0; -int xy = 0; -int showtext = 0; - -struct options_t options[] = -{ - {"a","action"}, - {"t","text"}, - {"X","width"}, - {"Y","height"}, - {"r","rate"}, - {"e","html"}, - {"v","verbose"}, - {"V","version"}, - {0,0} +static char idtab[65536]; +static char * indent = " "; + +static int placements = 0; +static int action = 0; +static int html = 0; +static int xy = 0; +static int showtext = 0; +static int hex = 0; +static int used = 0; + +static struct options_t options[] = { +{"h", "help"}, +{"D", "full"}, +{"V", "version"}, +{"e", "html"}, +{"a", "action"}, +{"t", "text"}, +{"p", "placements"}, +{"X", "width"}, +{"Y", "height"}, +{"r", "rate"}, +{"f", "frames"}, +{"d", "hex"}, +{"u", "used"}, +{0,0} }; - int args_callback_option(char*name,char*val) { if(!strcmp(name, "V")) { @@ -63,6 +83,10 @@ int args_callback_option(char*name,char*val) action = 1; return 0; } + else if(name[0]=='p') { + placements = 1; + return 0; + } else if(name[0]=='t') { showtext = 1; return 0; @@ -83,8 +107,25 @@ int args_callback_option(char*name,char*val) xy |= 4; return 0; } + else if(name[0]=='f') { + xy |= 8; + return 0; + } + else if(name[0]=='d') { + hex = 1; + return 0; + } + else if(name[0]=='u') { + used = 1; + return 0; + } + else if(name[0]=='D') { + action = placements = showtext = 1; + return 0; + } else { printf("Unknown option: -%s\n", name); + exit(1); } return 0; @@ -93,17 +134,25 @@ int args_callback_longoption(char*name,char*val) { return args_long2shortoption(options, name, val); } -void args_callback_usage(char*name) -{ - printf("Usage: %s [-at] file.swf\n", name); - 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-V , --version\t\t Print program version and exit\n"); +void args_callback_usage(char *name) +{ + printf("\n"); + printf("Usage: %s [-atpdu] file.swf\n", name); + printf("\n"); + printf("-h , --help Print short help message and exit\n"); + printf("-D , --full Show everything. Same as -atp\n"); + printf("-V , --version Print version info and exit\n"); + printf("-e , --html Print out html code for embedding the file\n"); + printf("-a , --action Disassemble action tags\n"); + printf("-t , --text Show text fields (like swfstrings).\n"); + printf("-p , --placements Show placement information\n"); + printf("-X , --width Prints out a string of the form \"-X width\".\n"); + printf("-Y , --height Prints out a string of the form \"-Y height\".\n"); + printf("-r , --rate Prints out a string of the form \"-r rate\".\n"); + printf("-f , --frames Prints out a string of the form \"-f framenum\".\n"); + printf("-d , --hex Print hex output of tag data, too.\n"); + printf("-u , --used Show referred IDs for each Tag.\n"); + printf("\n"); } int args_callback_command(char*name,char*val) { @@ -209,17 +258,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 /*glyph is in range*/ + || !fonts[font]->glyph2ascii /* font has ascii<->glyph mapping */ + ) + continue; + a = fonts[font]->glyph2ascii[glyphs[t]]; + } else { + a = glyphs[t]; + } if(a>=32) printf("%c", a); else @@ -233,6 +284,46 @@ void handleText(TAG*tag) printf("\n"); swf_FontExtract_DefineTextCallback(-1,0,tag,4, textcallback); } + +void handleDefineSound(TAG*tag) +{ + U16 id = swf_GetU16(tag); + U8 flags = swf_GetU8(tag); + int compression = (flags>>4)&3; + int rate = (flags>>2)&3; + int bits = flags&2?16:8; + int stereo = flags&1; + printf(" ("); + if(compression == 0) printf("Raw "); + else if(compression == 1) printf("ADPCM "); + else if(compression == 2) printf("MP3 "); + else printf("? "); + if(rate == 0) printf("5.5Khz "); + if(rate == 1) printf("11Khz "); + if(rate == 2) printf("22Khz "); + if(rate == 3) printf("44Khz "); + printf("%dBit ", bits); + if(stereo) printf("stereo"); + else printf("mono"); + printf(")"); +} + +void handleDefineBits(TAG*tag) +{ + U16 id; + U8 mode; + U16 width,height; + int bpp; + id = swf_GetU16(tag); + mode = swf_GetU8(tag); + width = swf_GetU16(tag); + height = swf_GetU16(tag); + printf(" image %dx%d",width,height); + if(mode == 3) printf(" (8 bpp)"); + else if(mode == 4) printf(" (16 bpp)"); + else if(mode == 5) printf(" (32 bpp)"); + else printf(" (? bpp)"); +} void handleEditText(TAG*tag) { @@ -283,7 +374,7 @@ void handleEditText(TAG*tag) // printf(" text \"%s\"\n", &tag->data[tag->pos]) ; } -void printhandlerflags(U16 handlerflags) +void printhandlerflags(U32 handlerflags) { if(handlerflags&1) printf("[on load]"); if(handlerflags&2) printf("[enter frame]"); @@ -293,64 +384,256 @@ void printhandlerflags(U16 handlerflags) 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("[???]"); + if(handlerflags&512) printf("[initialize]"); + if(handlerflags&1024) printf("[mouse press]"); + if(handlerflags&2048) printf("[mouse release]"); + if(handlerflags&4096) printf("[mouse release outside]"); + if(handlerflags&8192) printf("[mouse rollover]"); + if(handlerflags&16384) printf("[mouse rollout]"); + if(handlerflags&32768) printf("[mouse drag over]"); + + if(handlerflags&0x10000) printf("[mouse drag out]"); + if(handlerflags&0x20000) printf("[key press]"); + if(handlerflags&0x40000) printf("[construct even]"); + if(handlerflags&0xfff80000) printf("[???]"); +} +void handleVideoStream(TAG*tag, char*prefix) +{ + U16 id = swf_GetU16(tag); + U16 frames = swf_GetU16(tag); + U16 width = swf_GetU16(tag); + U16 height = swf_GetU16(tag); + U8 flags = swf_GetU8(tag); //5-2(videopacket 01=off 10=on)-1(smoothing 1=on) + U8 codec = swf_GetU8(tag); + printf(" (%d frames, %dx%d", frames, width, height); + if(flags&1) + printf(" smoothed"); + if(codec == 2) + printf(" sorenson h.263)"); + else + printf(" codec 0x%02x)", codec); } +void handleVideoFrame(TAG*tag, char*prefix) +{ + U32 code, version, reference, sizeflags; + U32 width=0, height=0; + U8 type; + U16 id = swf_GetU16(tag); + U16 frame = swf_GetU16(tag); + U8 deblock,flags, tmp, bit; + U32 quantizer; + char*types[] = {"I-frame", "P-frame", "disposable P-frame", ""}; + printf(" (frame %d) ", frame); + + /* video packet follows */ + code = swf_GetBits(tag, 17); + version = swf_GetBits(tag, 5); + reference = swf_GetBits(tag, 8); + + sizeflags = swf_GetBits(tag, 3); + switch(sizeflags) + { + case 0: width = swf_GetBits(tag, 8); height = swf_GetBits(tag, 8); break; + case 1: width = swf_GetBits(tag, 16); height = swf_GetBits(tag, 16); break; + case 2: width = 352; height = 288; break; + case 3: width = 176; height = 144; break; + case 4: width = 128; height = 96; break; + case 5: width = 320; height = 240; break; + case 6: width = 160; height = 120; break; + case 7: width = -1; height = -1;/*reserved*/ break; + } + printf("%dx%d ", width, height); + type = swf_GetBits(tag, 2); + printf("%s", types[type]); + + deblock = swf_GetBits(tag, 1); + if(deblock) + printf(" deblock ", deblock); + quantizer = swf_GetBits(tag, 5); + printf(" quant: %d ", quantizer); +} + void handlePlaceObject2(TAG*tag, char*prefix) { U8 flags = swf_GetU8(tag); + MATRIX m; + CXFORM cx; + char pstr[3][160]; + int ppos[3] = {0,0,0}; + 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&4) { + swf_GetMatrix(tag,&m); + if(placements) { + ppos[0] += sprintf(pstr[0], "| Matrix "); + ppos[1] += sprintf(pstr[1], "| %5.3f %5.3f %6.2f ", m.sx/65536.0, m.r1/65536.0, m.tx/20.0); + ppos[2] += sprintf(pstr[2], "| %5.3f %5.3f %6.2f ", m.r0/65536.0, m.sy/65536.0, m.ty/20.0); + } + } + if(flags&8) { + swf_GetCXForm(tag, &cx, 1); + if(placements) { + ppos[0] += sprintf(pstr[0]+ppos[0], "| CXForm r g b a "); + ppos[1] += sprintf(pstr[1]+ppos[1], "| mul %4.1f %4.1f %4.1f %4.1f ", cx.r0/256.0, cx.g0/256.0, cx.b0/256.0, cx.a0/256.0); + ppos[2] += sprintf(pstr[2]+ppos[2], "| add %4d %4d %4d %4d ", cx.r1, cx.g1, cx.b1, cx.a1); + } + } + if(flags&16) { + U16 ratio = swf_GetU16(tag); //ratio + if(placements) { + ppos[0] += sprintf(pstr[0]+ppos[0], "| Ratio "); + ppos[1] += sprintf(pstr[1]+ppos[1], "| %-5d ", ratio); + ppos[2] += sprintf(pstr[2]+ppos[2], "| "); + } + } + if(flags&64) { + U16 clip = swf_GetU16(tag); //clip + if(placements) { + ppos[0] += sprintf(pstr[0]+ppos[0], "| Clip "); + ppos[1] += sprintf(pstr[1]+ppos[1], "| %-5d ", clip); + ppos[2] += sprintf(pstr[2]+ppos[2], "| "); + } + } + if(flags&32) { while(swf_GetU8(tag)); } + if(placements && ppos[0]) { + printf("\n"); + printf("%s %s\n", prefix, pstr[0]); + printf("%s %s\n", prefix, pstr[1]); + printf("%s %s", prefix, pstr[2]); } - if(flags&64) swf_GetU16(tag); //clip if(flags&128) { if (action) { - U16 globalflags; + U16 reserved; + U32 globalflags; + U32 handlerflags; + char is32 = 0; printf("\n"); - swf_GetU16(tag); - globalflags = swf_GetU16(tag); -// printf("%s global flags:%04x ",prefix, handlerflags); -// printhandlerflags(globalflags); -// printf("\n"); - while(1) { + reserved = swf_GetU16(tag); // must be 0 + globalflags = swf_GetU16(tag); //TODO: 32 if version>=6 + if(reserved) { + printf("Unknown parameter field not zero: %04x\n", reserved); + return; + } + printf("global flags: %04x\n", globalflags); + + handlerflags = swf_GetU16(tag); //TODO: 32 if version>=6 + 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); //TODO: 32 if version>=6 } 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"); } } else printf("\n"); } + +void handlePlaceObject(TAG*tag, char*prefix) +{ + /*TODO*/ +} void fontcallback1(U16 id,U8 * name) { fontnum++; } void fontcallback2(U16 id,U8 * name) -{ swf_FontExtract(&swf,id,&fonts[fontnum]); +{ + swf_FontExtract(&swf,id,&fonts[fontnum]); fontnum++; } +static U8 printable(U8 a) +{ + if(a<32 || a==127) return '.'; + else return a; +} +void hexdumpTag(TAG*tag, char* prefix) +{ + int t; + char ascii[32]; + printf(" %s-=> ",prefix); + for(t=0;tlen;t++) { + printf("%02x ", tag->data[t]); + ascii[t&15] = printable(tag->data[t]); + if((t && ((t&15)==15)) || (t==tag->len-1)) + { + int s,p=((t-1)&15)+1; + ascii[p] = 0; + for(s=p;s<16;s++) { + printf(" "); + } + if(t==tag->len-1) + printf(" %s\n", ascii); + else + printf(" %s\n %s-=> ",ascii,prefix); + } + } +} + +void handleExportAssets(TAG*tag, char* prefix) +{ + int num; + U16 id; + char* name; + int t; + num = swf_GetU16(tag); + for(t=0;t8) { + fprintf(stderr, "Fileversion>8\n"); + exit(1); + } printf("\n" + //http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,23,0? + " CODEBASE=\"http://active.macromedia.com/flash5/cabs/swflash.cab#version=%s\">\n" " \n" " \n" " \n" " \n" - " \n" + " PLUGINSPAGE=\"http://www.macromedia.com/go/getflashplayer\">\n" " \n" - "\n", xsize, ysize, swf.fileVersion, filename, filename, xsize, ysize); + "\n", xsize, ysize, fileversions[swf.fileVersion], + filename, filename, xsize, ysize); 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); - printf("[HEADER] Movie height: %.3f\n",(swf.movieSize.ymax-swf.movieSize.ymin)/20.0); + printf("[HEADER] Movie width: %.2f",(swf.movieSize.xmax-swf.movieSize.xmin)/20.0); + if(swf.movieSize.xmin) + printf(" (left offset: %.2f)\n", swf.movieSize.xmin/20.0); + else + printf("\n"); + printf("[HEADER] Movie height: %.2f",(swf.movieSize.ymax-swf.movieSize.ymin)/20.0); + if(swf.movieSize.ymin) + printf(" (top offset: %.2f)\n", swf.movieSize.ymin/20.0); + else + printf("\n"); tag = swf.firstTag; @@ -460,41 +777,94 @@ 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); - tag = tag->next; - continue; + 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(swf_TagGetName(tag)) { + printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag)); + } else { + printf("[%03x] %9ld %sUNKNOWN TAG %03x", tag->id, tag->len, prefix, tag->id); + } + + 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)); + handlePlaceObject(tag, myprefix); } + 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_FREECHARACTER) { + printf(" frees object %04d", swf_GetPlaceID(tag)); + } + else if(tag->id == ST_STARTSOUND) { + U8 flags; + U16 id; + id = swf_GetU16(tag); + flags = swf_GetU8(tag); + if(flags & 32) + printf(" stops sound with id %04d", id); + else + printf(" starts sound with id %04d", id); + if(flags & 16) + printf(" (if not already playing)"); + if(flags & 1) + swf_GetU32(tag); + if(flags & 2) + swf_GetU32(tag); + if(flags & 4) { + printf(" looping %d times", swf_GetU16(tag)); + } + } else if(tag->id == ST_FRAMELABEL) { + int l = strlen(tag->data); printf(" \"%s\"", tag->data); - if(framelabel) { - fprintf(stderr, "Error: Frame %d has more than one label\n", + 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", issprite?spriteframe:mainframe); } if(issprite) spriteframelabel = tag->data; @@ -513,19 +883,55 @@ int main (int argc,char ** argv) } } if(nframe == frame) - printf(" %d", frame); + printf(" %d (%s)", frame, timestring(frame*(256.0/(swf.frameRate+0.1)))); else - printf(" %d-%d", frame, nframe); + printf(" %d-%d (%s-%s)", frame, nframe, + timestring(frame*(256.0/(swf.frameRate+0.1))), + timestring(nframe*(256.0/(swf.frameRate+0.1))) + ); if(label) printf(" (label \"%s\")", label); if(issprite) {spriteframe++; spriteframelabel = 0;} if(!issprite) {mainframe++; framelabel = 0;} } - if(tag->id == ST_DEFINEEDITTEXT) { + if(tag->id == ST_SETBACKGROUNDCOLOR) { + U8 r = swf_GetU8(tag); + U8 g = swf_GetU8(tag); + U8 b = swf_GetU8(tag); + printf(" (%02x/%02x/%02x)\n",r,g,b); + } + else if(tag->id == ST_PROTECT) { + if(tag->len>0) { + printf(" %s\n", swf_GetString(tag)); + } + } + else if(tag->id == ST_DEFINEBITSLOSSLESS || + tag->id == ST_DEFINEBITSLOSSLESS2) { + handleDefineBits(tag); + printf("\n"); + } + else if(tag->id == ST_DEFINESOUND) { + handleDefineSound(tag); + printf("\n"); + } + else if(tag->id == ST_VIDEOFRAME) { + handleVideoFrame(tag, myprefix); + printf("\n"); + } + else if(tag->id == ST_DEFINEVIDEOSTREAM) { + handleVideoStream(tag, myprefix); + printf("\n"); + } + else if(tag->id == ST_DEFINEEDITTEXT) { handleEditText(tag); printf("\n"); } + else if(tag->id == ST_DEFINEMOVIE) { + U16 id = swf_GetU16(tag); + char*s = swf_GetString(tag); + printf(" URL: %s\n", s); + } else if(tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) { if(showtext) handleText(tag); @@ -534,6 +940,10 @@ int main (int argc,char ** argv) } else if(tag->id == ST_PLACEOBJECT2) { } + else if(tag->id == ST_NAMECHARACTER) { + swf_GetU16(tag); + printf(" \"%s\"\n", swf_GetString(tag)); + } else { printf("\n"); } @@ -543,7 +953,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,9 +962,13 @@ 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_EXPORTASSETS) { + handleExportAssets(tag, myprefix); + } else if(tag->id == ST_DOACTION && action) { ActionTAG*actions; actions = swf_ActionGet(tag); @@ -567,12 +981,30 @@ int main (int argc,char ** argv) dumpButton2Actions(tag, myprefix); } else if(tag->id == ST_PLACEOBJECT2) { - if((*(U8*)tag->data)&0x80) - handlePlaceObject2(tag, myprefix); - else + handlePlaceObject2(tag, myprefix); + } + + 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;tlen && hex) { + hexdumpTag(tag, prefix); } tag = tag->next; + fflush(stdout); } swf_FreeTags(&swf);