X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfdump.c;h=0828ea45b2de542e1b0f4c340917af81db545e57;hp=e434ceb41034b5a5c804fae2e2070b9aa85a70fb;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=9f9d321b0db0fa20cc08904220d7f3a89415cc59 diff --git a/src/swfdump.c b/src/swfdump.c index e434ceb..0828ea4 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -58,6 +58,9 @@ static int showshapes = 0; static int hex = 0; static int used = 0; static int bbox = 0; +static int cumulative = 0; +static int showfonts = 0; +static int showbuttons = 0; static struct options_t options[] = { {"h", "help"}, @@ -68,7 +71,9 @@ static struct options_t options[] = { {"a", "action"}, {"t", "text"}, {"s", "shapes"}, +{"F", "fonts"}, {"p", "placements"}, +{"B", "buttons"}, {"b", "bbox"}, {"X", "width"}, {"Y", "height"}, @@ -105,6 +110,10 @@ int args_callback_option(char*name,char*val) html = 1; return 0; } + else if(name[0]=='c') { + cumulative = 1; + return 0; + } else if(name[0]=='E') { html = 1; xhtml = 1; @@ -126,6 +135,10 @@ int args_callback_option(char*name,char*val) xy |= 8; return 0; } + else if(name[0]=='F') { + showfonts = 1; + return 0; + } else if(name[0]=='d') { hex = 1; return 0; @@ -138,8 +151,12 @@ int args_callback_option(char*name,char*val) bbox = 1; return 0; } + else if(name[0]=='B') { + showbuttons = 1; + return 0; + } else if(name[0]=='D') { - action = placements = showtext = showshapes = 1; + showbuttons = action = placements = showtext = showshapes = 1; return 0; } else { @@ -162,10 +179,13 @@ void args_callback_usage(char *name) 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("-E , --xhtml Print out xhtml code for embedding the file\n"); printf("-a , --action Disassemble action tags\n"); printf("-t , --text Show text fields (like swfstrings).\n"); printf("-s , --shapes Show shape coordinates/styles\n"); + printf("-F , --fonts Show font information\n"); printf("-p , --placements Show placement information\n"); + printf("-B , --buttons Show button information\n"); printf("-b , --bbox Print tag's bounding boxes\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"); @@ -237,6 +257,7 @@ void dumpButton2Actions(TAG*tag, char*prefix) void dumpButtonActions(TAG*tag, char*prefix) { ActionTAG*actions; + swf_SetTagPos(tag, 0); swf_GetU16(tag); // id while (swf_GetU8(tag)) // state -> parse ButtonRecord { swf_GetU16(tag); // id @@ -245,16 +266,128 @@ void dumpButtonActions(TAG*tag, char*prefix) } actions = swf_ActionGet(tag); swf_DumpActions(actions, prefix); + swf_ActionFree(actions); +} + +void dumpButton(TAG*tag, char*prefix) +{ + swf_SetTagPos(tag, 0); + swf_GetU16(tag); // id + while (1) { + U8 flags = swf_GetU8(tag); + if(!flags) + break; + U16 id = swf_GetU16(tag); + U16 depth = swf_GetU16(tag); + char event[80]; + sprintf(event, "%s%s%s%s", + (flags&BS_HIT)?"[hit]":"", + (flags&BS_DOWN)?"[down]":"", + (flags&BS_OVER)?"[over]":"", + (flags&BS_UP)?"[up]":""); + if(flags&0xf0) { + printf("%s | Show %d at depth %d for %s flags=%02x\n", prefix, id, depth, event, flags); + } else { + printf("%s | Show %d at depth %d for %s\n", prefix, id, depth, event); + } + swf_GetMatrix(tag,NULL); // matrix + } +} + +void dumpFont(TAG*tag, char*prefix) +{ + SWFFONT* font = malloc(sizeof(SWFFONT)); + memset(font, 0, sizeof(SWFFONT)); + if(tag->id == ST_DEFINEFONT2 || tag->id == ST_DEFINEFONT3) { + swf_FontExtract_DefineFont2(0, font, tag); + } else if(tag->id == ST_DEFINEFONT) { + swf_FontExtract_DefineFont(0, font, tag); + } else { + printf("%sCan't parse %s yet\n", prefix,swf_TagGetName(tag)); + } + printf("%sID: %d\n", prefix,font->id); + printf("%sVersion: %d\n", prefix,font->version); + printf("%sname: %s\n", prefix,font->name); + printf("%scharacters: %d\n", prefix,font->numchars); + printf("%shightest mapped unicode value: %d\n", prefix,font->maxascii); + if(font->layout) + { + printf("%sascent:%.2f\n", prefix,font->layout->ascent / 20.0); + printf("%sdescent:%.2f\n", prefix,font->layout->descent / 20.0); + printf("%sleading:%.2f\n", prefix,font->layout->leading / 20.0); + printf("%skerning records:%d\n", prefix,font->layout->kerningcount); + } + printf("%sstyle: %d\n", prefix,font->style); + printf("%sencoding: %02x\n", prefix,font->encoding); + printf("%slanguage: %02x\n", prefix,font->language); + int t; + for(t=0;tnumchars;t++) { + int u = font->glyph2ascii?font->glyph2ascii[t]:-1; + char ustr[16]; + if(u>=32) sprintf(ustr, " '%c'", u); + else sprintf(ustr, " 0x%02x", u); + printf("%s== Glyph %d: advance=%d encoding=%d%s ==\n", prefix, t, font->glyph[t].advance, u, ustr); + SHAPE2* shape = swf_ShapeToShape2(font->glyph[t].shape); + SHAPELINE*line = shape->lines; + + while(line) { + if(line->type == moveTo) { + printf("%smoveTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0); + } else if(line->type == lineTo) { + printf("%slineTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0); + } else if(line->type == splineTo) { + printf("%ssplineTo (%.2f %.2f) %.2f %.2f\n", prefix, + line->sx/20.0, line->sy/20.0, + line->x/20.0, line->y/20.0 + ); + } + line = line->next; + } + swf_Shape2Free(shape); + free(shape); + } + + /* + not part of the file + + printf("%sencoding table:", prefix, prefix); + char filled0=0, lastfilled=0; + for(t=0;tmaxascii;t++) { + if((t&15)==0) { + printf("\n%s%08x ", prefix, t); + int s; + if(!filled0 && t) { + for(s=t;smaxascii;s++) { + if(font->ascii2glyph[s]>=0) break; + } + if(s>t+32) { + printf("*"); + t = ((s-16)&~15)-1; + continue; + } + } + filled0 = 0; + for(s=t;smaxascii;s++) { + if(font->ascii2glyph[s]>=0) filled0=1; + } + } + printf("%4d ", font->ascii2glyph[t]); + } + printf("\n");*/ + + swf_FontFree(font); } -SWF swf; -int fontnum = 0; -SWFFONT**fonts; +static SWF swf; +static int fontnum = 0; +static SWFFONT**fonts; -void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fontsize, int startx, int starty, RGBA*color) +void textcallback(void*self, int*glyphs, int*xpos, int nr, int fontid, int fontsize, int startx, int starty, RGBA*color) { int font=-1,t; - printf(" <%2d glyphs in font %2d, color #%02x%02x%02x%02x> ",nr, fontid, color->r, color->g, color->b, color->a); + if(nr<1) + return; + printf(" <%2d glyphs in font %04d size %d, color #%02x%02x%02x%02x at %.2f,%.2f> ",nr, fontid, fontsize, color->r, color->g, color->b, color->a, (startx+xpos[0])/20.0, starty/20.0); for(t=0;tid == fontid) { @@ -270,8 +403,12 @@ void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fonts if(glyphs[t] >= fonts[font]->numchars /*glyph is in range*/ || !fonts[font]->glyph2ascii /* font has ascii<->glyph mapping */ ) a = glyphs[t]; - else - a = fonts[font]->glyph2ascii[glyphs[t]]; + else { + if(fonts[font]->glyph2ascii[glyphs[t]]) + a = fonts[font]->glyph2ascii[glyphs[t]]; + else + a = glyphs[t]; + } } else { a = glyphs[t]; } @@ -283,17 +420,31 @@ void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fonts printf("\n"); } -void handleText(TAG*tag) +void handleText(TAG*tag, char*prefix) { printf("\n"); - swf_ParseDefineText(tag,textcallback, 0); + if(placements) { + swf_SetTagPos(tag, 0); + swf_GetU16(tag); + swf_GetRect(tag, 0); + swf_ResetReadBits(tag); + MATRIX m; + swf_GetMatrix(tag, &m); + printf("%s| Matrix\n",prefix); + printf("%s| %5.3f %5.3f %6.2f\n", prefix, m.sx/65536.0, m.r1/65536.0, m.tx/20.0); + printf("%s| %5.3f %5.3f %6.2f\n", prefix, m.r0/65536.0, m.sy/65536.0, m.ty/20.0); + swf_SetTagPos(tag, 0); + } + if(showtext) { + swf_ParseDefineText(tag,textcallback, 0); + } } void handleDefineSound(TAG*tag) { U16 id = swf_GetU16(tag); U8 flags = swf_GetU8(tag); - int compression = (flags>>4)&3; + int compression = (flags>>4)&7; int rate = (flags>>2)&3; int bits = flags&2?16:8; int stereo = flags&1; @@ -301,6 +452,8 @@ void handleDefineSound(TAG*tag) if(compression == 0) printf("Raw "); else if(compression == 1) printf("ADPCM "); else if(compression == 2) printf("MP3 "); + else if(compression == 3) printf("Raw little-endian "); + else if(compression == 6) printf("ASAO "); else printf("? "); if(rate == 0) printf("5.5Khz "); if(rate == 1) printf("11Khz "); @@ -456,20 +609,73 @@ void handleVideoFrame(TAG*tag, char*prefix) deblock = swf_GetBits(tag, 1); if(deblock) - printf(" deblock ", deblock); + printf(" deblock %d ", deblock); quantizer = swf_GetBits(tag, 5); printf(" quant: %d ", quantizer); } -void handlePlaceObject2(TAG*tag, char*prefix) +void dumpFilter(FILTER*filter) { - U8 flags; + if(filter->type == FILTERTYPE_BLUR) { + FILTER_BLUR*f = (FILTER_BLUR*)filter; + printf("blurx: %f blury: %f\n", f->blurx, f->blury); + printf("passes: %d\n", f->passes); + } if(filter->type == FILTERTYPE_GLOW) { + FILTER_GLOW*f = (FILTER_GLOW*)filter; + printf("color %02x%02x%02x%02x\n", f->rgba.r,f->rgba.g,f->rgba.b,f->rgba.a); + printf("blurx: %f blury: %f strength: %f\n", f->blurx, f->blury, f->strength); + printf("passes: %d\n", f->passes); + printf("flags: %s%s%s\n", + f->knockout?"knockout ":"", + f->composite?"composite ":"", + f->innerglow?"innerglow":""); + } if(filter->type == FILTERTYPE_DROPSHADOW) { + FILTER_DROPSHADOW*f = (FILTER_DROPSHADOW*)filter; + printf("blurx: %f blury: %f\n", f->blurx, f->blury); + printf("passes: %d\n", f->passes); + printf("angle: %f distance: %f\n", f->angle, f->distance); + printf("strength: %f passes: %d\n", f->strength, f->passes); + printf("flags: %s%s%s\n", + f->knockout?"knockout ":"", + f->composite?"composite ":"", + f->innershadow?"innershadow ":""); + } if(filter->type == FILTERTYPE_BEVEL) { + FILTER_BEVEL*f = (FILTER_BEVEL*)filter; + printf("blurx: %f blury: %f\n", f->blurx, f->blury); + printf("passes: %d\n", f->passes); + printf("angle: %f distance: %f\n", f->angle, f->distance); + printf("strength: %f passes: %d\n", f->strength, f->passes); + printf("flags: %s%s%s%s\n", + f->ontop?"ontop":"", + f->knockout?"knockout ":"", + f->composite?"composite ":"", + f->innershadow?"innershadow ":""); + } if(filter->type == FILTERTYPE_GRADIENTGLOW) { + FILTER_GRADIENTGLOW*f = (FILTER_GRADIENTGLOW*)filter; + swf_DumpGradient(stdout, f->gradient); + printf("blurx: %f blury: %f\n", f->blurx, f->blury); + printf("angle: %f distance: %f\n", f->angle, f->distance); + printf("strength: %f passes: %d\n", f->strength, f->passes); + printf("flags: %s%s%s%s\n", + f->knockout?"knockout ":"", + f->ontop?"ontop ":"", + f->composite?"composite ":"", + f->innershadow?"innershadow ":""); + } + rfx_free(filter); +} + +void handlePlaceObject23(TAG*tag, char*prefix) +{ + U8 flags,flags2=0; MATRIX m; CXFORM cx; - char pstr[3][160]; + char pstr[3][256]; int ppos[3] = {0,0,0}; swf_SetTagPos(tag, 0); flags = swf_GetU8(tag); + if(tag->id == ST_PLACEOBJECT3) + flags2 = swf_GetU8(tag); swf_GetU16(tag); //depth //flags&1: move @@ -502,11 +708,48 @@ void handlePlaceObject2(TAG*tag, char*prefix) 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[1] += sprintf(pstr[1]+ppos[1], "| %-4d ", clip); ppos[2] += sprintf(pstr[2]+ppos[2], "| "); } } if(flags&32) { while(swf_GetU8(tag)); } + + if(flags2&1) { // filter list + U8 num = swf_GetU8(tag); + if(placements) + printf("\n%d filters\n", num); + char*filtername[] = {"dropshadow","blur","glow","bevel","gradientglow","convolution","colormatrix","gradientbevel"}; + int t; + for(t=0;ttype, (filter->typetype]:"?"); + dumpFilter(filter); + } + } + } + if(flags2&2) { // blend mode + U8 blendmode = swf_GetU8(tag); + if(placements) { + int t; + char name[80]; + sprintf(name, "%-5d", blendmode); + for(t=0;blendModeNames[t];t++) { + if(blendmode==t) { + sprintf(name, "%-5s", blendModeNames[t]); + break; + } + } + ppos[0] += sprintf(pstr[0]+ppos[0], "| Blend "); + ppos[1] += sprintf(pstr[1]+ppos[1], "| %s ", name); + ppos[2] += sprintf(pstr[2]+ppos[2], "| "); + } + } + if(placements && ppos[0]) { printf("\n"); printf("%s %s\n", prefix, pstr[0]); @@ -561,12 +804,12 @@ void handlePlaceObject(TAG*tag, char*prefix) { TAG*tag2 = swf_InsertTag(0, ST_PLACEOBJECT2); U16 id, depth; + MATRIX matrix; + CXFORM cxform; swf_SetTagPos(tag, 0); id = swf_GetU16(tag); depth = swf_GetU16(tag); - MATRIX matrix; - CXFORM cxform; swf_GetMatrix(tag, &matrix); swf_GetCXForm(tag, &cxform, 0); @@ -576,7 +819,7 @@ void handlePlaceObject(TAG*tag, char*prefix) swf_SetMatrix(tag2, &matrix); swf_SetCXForm(tag2, &cxform, 1); - handlePlaceObject2(tag2, prefix); + handlePlaceObject23(tag2, prefix); } char stylebuf[256]; char* fillstyle2str(FILLSTYLE*style) @@ -585,12 +828,20 @@ char* fillstyle2str(FILLSTYLE*style) case 0x00: sprintf(stylebuf, "SOLID %02x%02x%02x%02x", style->color.r, style->color.g, style->color.b, style->color.a); break; - case 0x10: case 0x12: + case 0x10: case 0x11: case 0x12: case 0x13: sprintf(stylebuf, "GRADIENT (%d steps)", style->gradient.num); break; - case 0x40: case 0x41: + case 0x40: case 0x42: /* TODO: display information about that bitmap */ - sprintf(stylebuf, "BITMAP %d", style->id_bitmap); + sprintf(stylebuf, "BITMAPt%s %d", (style->type&2)?"n":"", style->id_bitmap); + /* TODO: show matrix */ + //swf_DumpMatrix(stdout, &style->m); + break; + case 0x41: case 0x43: + /* TODO: display information about that bitmap */ + sprintf(stylebuf, "BITMAPc%s %d", (style->type&2)?"n":"", style->id_bitmap); + /* TODO: show matrix */ + //swf_DumpMatrix(stdout, &style->m); break; default: sprintf(stylebuf, "UNKNOWN[%02x]",style->type); @@ -633,6 +884,10 @@ void handleShape(TAG*tag, char*prefix) printf("%-2d) %s", t+1, linestyle2str(&shape.linestyles[t])); } printf("\n"); + //if(shape.fillstyles[t].type&0x40) { + // MATRIX m = shape.fillstyles[t].m; + // swf_DumpMatrix(stdout, &m); + //} } printf("%s |\n", prefix); @@ -712,13 +967,105 @@ void handleExportAssets(TAG*tag, char* prefix) } } +static void handleFontAlign1(TAG*tag) +{ + swf_SetTagPos(tag, 0); + U16 id = swf_GetU16(tag); + U8 flags = swf_GetU8(tag); + printf(" for font %04d, ", id); + if((flags&3)==0) printf("thin, "); + else if((flags&3)==1) printf("medium, "); + else if((flags&3)==2) printf("thick, "); + else printf("?, "); + int num=0; + while(tag->pos < tag->len) { + int nr = swf_GetU8(tag); // should be 2 + int t; + if(nr>2) { + printf("*** unsupported multiboxes ***, "); + break; + } + for(t=0;tprev) swf.firstTag = swf.firstTag->prev; + SWFFONT* font = 0; + swf_FontExtract(&swf, id, &font); +#endif + swf_SetTagPos(tag, 3); + while(tag->pos < tag->len) { + printf("%sglyph %d) ", prefix, num); + int nr = swf_GetU8(tag); // should be 2 + int t; + for(t=0;t<2;t++) { + // pos + float v = swf_GetF16(tag); + printf("%f ", v*1024.0); + } + int s; + for(s=0;snumchars) { + SHAPE2* shape = swf_ShapeToShape2(font->glyph[num].shape); + SHAPELINE*line = shape->lines; + while(line) { + if(line->type == moveTo) { + printf("%smoveTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0); + } else if(line->type == lineTo) { + printf("%slineTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0); + } else if(line->type == splineTo) { + printf("%ssplineTo (%.2f %.2f) %.2f %.2f\n", prefix, + line->sx/20.0, line->sy/20.0, + line->x/20.0, line->y/20.0 + ); + } + line = line->next; + } + swf_Shape2Free(shape); + free(shape); + } + if(num==font->numchars-1) break; +#endif + num++; + } +} + + void dumperror(const char* format, ...) { char buf[1024]; va_list arglist; va_start(arglist, format); - vsprintf(buf, format, arglist); + vsnprintf(buf, sizeof(buf)-1, format, arglist); va_end(arglist); if(!html && !xy) @@ -755,6 +1102,7 @@ int main (int argc,char ** argv) char* framelabel = 0; char prefix[128]; int filesize = 0; + int filepos = 0; prefix[0] = 0; memset(idtab,0,65536); @@ -767,30 +1115,46 @@ int main (int argc,char ** argv) } f = open(filename,O_RDONLY|O_BINARY); - if (f<0) { char buffer[256]; - sprintf(buffer, "Couldn't open %s", filename); + sprintf(buffer, "Couldn't open %.200s", filename); perror(buffer); exit(1); } - if FAILED(swf_ReadSWF(f,&swf)) - { - fprintf(stderr, "%s is not a valid SWF file or contains errors.\n",filename); - close(f); - exit(1); - } + char header[3]; + read(f, header, 3); + char compressed = (header[0]=='C'); + char isflash = (header[0]=='F' && header[1] == 'W' && header[2] == 'S') || + (header[0]=='C' && header[1] == 'W' && header[2] == 'S'); + close(f); + + int fl=strlen(filename); + if(!isflash && fl>3 && !strcmp(&filename[fl-4], ".abc")) { + swf_ReadABCfile(filename, &swf); + } else { + f = open(filename,O_RDONLY|O_BINARY); + if FAILED(swf_ReadSWF(f,&swf)) + { + fprintf(stderr, "%s is not a valid SWF file or contains errors.\n",filename); + close(f); + exit(1); + } #ifdef HAVE_STAT - fstat(f, &statbuf); - 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; + fstat(f, &statbuf); + if(statbuf.st_size != swf.fileSize && !compressed) + dumperror("Real Filesize (%d) doesn't match header Filesize (%d)", + statbuf.st_size, swf.fileSize); + filesize = statbuf.st_size; #endif + close(f); + } - close(f); + //if(action && swf.fileVersion>=9) { + // fprintf(stderr, "Actionscript parsing (-a) not yet supported for SWF versions>=9\n"); + // action = 0; + //} xsize = (swf.movieSize.xmax-swf.movieSize.xmin)/20; ysize = (swf.movieSize.ymax-swf.movieSize.ymin)/20; @@ -823,9 +1187,9 @@ int main (int argc,char ** argv) if(html) { char*fileversions[] = {"","1,0,0,0", "2,0,0,0","3,0,0,0","4,0,0,0", - "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0","9,0,0,0"}; - if(swf.fileVersion>9) { - fprintf(stderr, "Fileversion>9\n"); + "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0","9,0,0,0","10,0,0,0", "11,0,0,0", "12,0,0,0"}; + if(swf.fileVersion>10) { + fprintf(stderr, "Fileversion>10\n"); exit(1); } @@ -848,9 +1212,11 @@ int main (int argc,char ** argv) " \n" " \n" " \n" + " \n" " \n" " \n" "\n", xsize, ysize, fileversions[swf.fileVersion], @@ -859,14 +1225,14 @@ int main (int argc,char ** argv) return 0; } printf("[HEADER] File version: %d\n", swf.fileVersion); - if(swf.compressed) { + if(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] File size: %d%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: %.2f",(swf.movieSize.xmax-swf.movieSize.xmin)/20.0); @@ -898,36 +1264,22 @@ int main (int argc,char ** argv) //tag = tag->next; //continue; } - if(swf_TagGetName(tag)) { - printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag)); + if(!name) { + name = "UNKNOWN TAG"; + } + if(cumulative) { + filepos += tag->len; + printf("[%03x] %9d %9d %s%s", tag->id, tag->len, filepos, prefix, swf_TagGetName(tag)); } else { - printf("[%03x] %9ld %sUNKNOWN TAG %03x", tag->id, tag->len, prefix, tag->id); + printf("[%03x] %9d %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 %04d", id); - if(idtab[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 %04d", id); - if(!idtab[id]) - dumperror("Id %04d is not yet defined.\n", id); - } - else if(tag->id == ST_PLACEOBJECT) { + 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) { + else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) { if(tag->data[0]&1) printf(" moves"); else @@ -939,6 +1291,9 @@ int main (int argc,char ** argv) printf(" object"); printf(" at depth %04d", swf_GetDepth(tag)); + + if(tag->id == ST_PLACEOBJECT3 && tag->data[1]&4) + printf(" as bitmap"); swf_SetTagPos(tag, 0); if(tag->data[0]&64) { @@ -960,6 +1315,34 @@ int main (int argc,char ** argv) else if(tag->id == ST_FREECHARACTER) { printf(" frees object %04d", swf_GetPlaceID(tag)); } + else if(tag->id == ST_FILEATTRIBUTES) { + swf_SetTagPos(tag, 0); + U32 flags = swf_GetU32(tag); + if(flags&FILEATTRIBUTE_USENETWORK) printf(" usenetwork"); + if(flags&FILEATTRIBUTE_AS3) printf(" as3"); + if(flags&FILEATTRIBUTE_SYMBOLCLASS) printf(" symbolclass"); + if(flags&FILEATTRIBUTE_USEHARDWAREGPU) printf(" hardware-gpu"); + if(flags&FILEATTRIBUTE_USEACCELERATEDBLIT) printf(" accelerated-blit"); + if(flags&~(1|8|16|32|64)) + printf(" flags=%02x", flags); + } + else if(tag->id == ST_DOABC) { + swf_SetTagPos(tag, 0); + U32 flags = swf_GetU32(tag); + char*s = swf_GetString(tag); + if(flags&~1) { + printf(" flags=%08x", flags); + } + if(*s) { + printf(" \"%s\"", s); + } + if(flags&1) { + if(name) + printf(","); + printf(" lazy load"); + } + swf_SetTagPos(tag, 0); + } else if(tag->id == ST_STARTSOUND) { U8 flags; U16 id; @@ -980,11 +1363,11 @@ int main (int argc,char ** argv) } } else if(tag->id == ST_FRAMELABEL) { - int l = strlen(tag->data); + int l = strlen((char*)tag->data); printf(" \"%s\"", tag->data); - if(l < tag->len-1) { + if((l+1) < tag->len) { printf(" has %d extra bytes", tag->len-1-l); - if(tag ->len-1-l == 1 && tag->data[tag->len-1] == 1) + if(tag ->len - (l+1) == 1 && tag->data[tag->len-1] == 1) printf(" (ANCHOR)"); } if((framelabel && !issprite) || @@ -992,8 +1375,8 @@ int main (int argc,char ** argv) dumperror("Frame %d has more than one label", issprite?spriteframe:mainframe); } - if(issprite) spriteframelabel = tag->data; - else framelabel = tag->data; + if(issprite) spriteframelabel = (char*)tag->data; + else framelabel = (char*)tag->data; } else if(tag->id == ST_SHOWFRAME) { char*label = issprite?spriteframelabel:framelabel; @@ -1019,21 +1402,55 @@ int main (int argc,char ** argv) if(issprite) {spriteframe++; spriteframelabel = 0;} if(!issprite) {mainframe++; framelabel = 0;} } - - if(tag->id == ST_SETBACKGROUNDCOLOR) { + else 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); + printf(" (%02x/%02x/%02x)",r,g,b); } else if(tag->id == ST_PROTECT) { if(tag->len>0) { - printf(" %s\n", swf_GetString(tag)); - } else { - printf("\n"); + printf(" %s", swf_GetString(tag)); + } + } + else if(tag->id == ST_DEFINEFONTALIGNZONES) { + handleFontAlign1(tag); + } + else if(tag->id == ST_CSMTEXTSETTINGS) { + U16 id = swf_GetU16(tag); + U8 flags = swf_GetU8(tag); + printf(" ("); + if(flags&0x40) { + printf("flashtype,"); + } + switch(((flags>>3)&7)) { + case 0:printf("no grid,");break; + case 1:printf("pixel grid,");break; + case 2:printf("subpixel grid,");break; + case 3:printf("unknown grid,");break; } + if(flags&0x87) + printf("unknown[%08x],", flags); + float thickness = swf_GetFixed(tag); + float sharpness = swf_GetFixed(tag); + printf("s=%.2f,t=%.2f)", thickness, sharpness); + swf_GetU8(tag); } - else if(tag->id == ST_DEFINEBITSLOSSLESS || + else if(swf_isDefiningTag(tag)) { + U16 id = swf_GetDefineID(tag); + printf(" defines id %04d", id); + if(idtab[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 %04d", id); + if(!idtab[id]) + dumperror("Id %04d is not yet defined.\n", id); + } + + if(tag->id == ST_DEFINEBITSLOSSLESS || tag->id == ST_DEFINEBITSLOSSLESS2) { handleDefineBits(tag); printf("\n"); @@ -1060,14 +1477,17 @@ int main (int argc,char ** argv) printf(" URL: %s\n", s); } else if(tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) { - if(showtext) - handleText(tag); - else - printf("\n"); + handleText(tag, myprefix); } - else if(tag->id == ST_PLACEOBJECT2) { + else if(tag->id == ST_DEFINESCALINGGRID) { + U16 id = swf_GetU16(tag); + SRECT r; + swf_GetRect(tag, &r); + printf(" (%.2f,%.2f)-(%.2f,%.2f)\n", r.xmin/20.0, r.ymin/20.0, r.xmax/20.0, r.ymax/20.0); } - else if(tag->id == ST_NAMECHARACTER) { + else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) { + } + else if(tag->id == ST_NAMECHARACTER || tag->id==ST_DEFINEFONTNAME) { swf_GetU16(tag); printf(" \"%s\"\n", swf_GetString(tag)); } @@ -1102,7 +1522,7 @@ int main (int argc,char ** argv) if(tag->len) dumperror("End Tag not empty"); } - else if(tag->id == ST_EXPORTASSETS) { + else if(tag->id == ST_EXPORTASSETS || tag->id == ST_SYMBOLCLASS) { handleExportAssets(tag, myprefix); } else if(tag->id == ST_DOACTION && action) { @@ -1110,27 +1530,53 @@ int main (int argc,char ** argv) actions = swf_ActionGet(tag); swf_DumpActions(actions, myprefix); } + else if((tag->id == ST_DOABC || tag->id == ST_RAWABC) && action) { + void*abccode = swf_ReadABC(tag); + swf_DumpABC(stdout, abccode, ""); + swf_FreeABC(abccode); + } else if(tag->id == ST_DOINITACTION && action) { ActionTAG*actions; swf_GetU16(tag); // id actions = swf_ActionGet(tag); swf_DumpActions(actions, myprefix); } - else if(tag->id == ST_DEFINEBUTTON && action) { - dumpButtonActions(tag, myprefix); + else if(tag->id == ST_DEFINEBUTTON) { + if(showbuttons) { + dumpButton(tag, myprefix); + } + if(action) { + dumpButtonActions(tag, myprefix); + } } - else if(tag->id == ST_DEFINEBUTTON2 && action) { - dumpButton2Actions(tag, myprefix); + else if(swf_isFontTag(tag) && showfonts) { + dumpFont(tag, myprefix); + } + else if(tag->id == ST_DEFINEBUTTON2) { + if(action) { + dumpButton2Actions(tag, myprefix); + } } else if(tag->id == ST_PLACEOBJECT) { handlePlaceObject(tag, myprefix); } - else if(tag->id == ST_PLACEOBJECT2) { - handlePlaceObject2(tag, myprefix); + else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) { + handlePlaceObject23(tag, myprefix); + } + else if(tag->id == ST_DEFINEFONTALIGNZONES) { + handleFontAlign2(tag, myprefix); + } + else if(tag->id == ST_DEFINEFONTNAME) { + swf_SetTagPos(tag, 0); + swf_GetU16(tag); //id + swf_GetString(tag); //name + char* copyright = swf_GetString(tag); + printf("%s%s\n", myprefix, copyright); } else if(tag->id == ST_DEFINESHAPE || tag->id == ST_DEFINESHAPE2 || - tag->id == ST_DEFINESHAPE3) { + tag->id == ST_DEFINESHAPE3 || + tag->id == ST_DEFINESHAPE4) { if(showshapes) handleShape(tag, myprefix); } @@ -1155,6 +1601,13 @@ int main (int argc,char ** argv) printf("\n"); } } + + if(tag->id == ST_FREECHARACTER) { + U16 id; + swf_SetTagPos(tag, 0); + id = swf_GetU16(tag); + idtab[id] = 0; + } if(tag->len && hex) { hexdumpTag(tag, prefix);