X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=eb6b32b90a80ff4171ed57e2a21ceb1bc2489f9f;hb=b393b0a6f5fc9266369a4913f7453ef347f2a7ad;hp=294a3f24d836b2a2eab843fee267346451dcc10d;hpb=38c19185b95fb1c520088809254ab915db31ff5c;p=swftools.git diff --git a/src/swfdump.c b/src/swfdump.c index 294a3f2..eb6b32b 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -58,6 +58,7 @@ static int showshapes = 0; static int hex = 0; static int used = 0; static int bbox = 0; +static int cumulative = 0; static struct options_t options[] = { {"h", "help"}, @@ -105,6 +106,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; @@ -162,6 +167,7 @@ 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"); @@ -270,8 +276,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]; } @@ -293,7 +303,7 @@ 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 +311,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 "); @@ -461,13 +473,59 @@ void handleVideoFrame(TAG*tag, char*prefix) printf(" quant: %d ", quantizer); } -void handlePlaceObject2(TAG*tag, char*prefix) +void dumpFilter(FILTER*filter) { - U8 flags = swf_GetU8(tag); + 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_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 @@ -500,11 +558,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]); @@ -558,20 +653,23 @@ void handlePlaceObject2(TAG*tag, char*prefix) void handlePlaceObject(TAG*tag, char*prefix) { TAG*tag2 = swf_InsertTag(0, ST_PLACEOBJECT2); - - U16 id = swf_GetU16(tag); - U16 depth = swf_GetU16(tag); + U16 id, depth; MATRIX matrix; CXFORM cxform; + + swf_SetTagPos(tag, 0); + id = swf_GetU16(tag); + depth = swf_GetU16(tag); swf_GetMatrix(tag, &matrix); swf_GetCXForm(tag, &cxform, 0); - swf_SetU8(tag2, 14); + swf_SetU8(tag2, 14 /* char, matrix, cxform */); swf_SetU16(tag2, depth); + swf_SetU16(tag2, id); swf_SetMatrix(tag2, &matrix); swf_SetCXForm(tag2, &cxform, 1); - handlePlaceObject2(tag2, prefix); + handlePlaceObject23(tag2, prefix); } char stylebuf[256]; char* fillstyle2str(FILLSTYLE*style) @@ -580,12 +678,18 @@ 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, "BITMAPt%s %d", (style->type&2)?"n":"", style->id_bitmap); + /* TODO: show matrix */ + break; + case 0x41: case 0x43: /* TODO: display information about that bitmap */ - sprintf(stylebuf, "BITMAP %d", style->id_bitmap); + sprintf(stylebuf, "BITMAPc%s %d", (style->type&2)?"n":"", style->id_bitmap); + /* TODO: show matrix */ break; default: sprintf(stylebuf, "UNKNOWN[%02x]",style->type); @@ -750,6 +854,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); @@ -893,17 +998,16 @@ 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] %9ld %9ld %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] %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 %04d", id); @@ -922,7 +1026,7 @@ int main (int argc,char ** argv) 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 @@ -934,7 +1038,11 @@ 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) { SWFPLACEOBJECT po; swf_GetPlaceObject(tag, &po); @@ -976,9 +1084,9 @@ int main (int argc,char ** argv) else if(tag->id == ST_FRAMELABEL) { int l = strlen(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) || @@ -1027,6 +1135,26 @@ int main (int argc,char ** argv) printf("\n"); } } + 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)\n", thickness, sharpness); + swf_GetU8(tag); + } else if(tag->id == ST_DEFINEBITSLOSSLESS || tag->id == ST_DEFINEBITSLOSSLESS2) { handleDefineBits(tag); @@ -1059,7 +1187,7 @@ int main (int argc,char ** argv) else printf("\n"); } - else if(tag->id == ST_PLACEOBJECT2) { + else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) { } else if(tag->id == ST_NAMECHARACTER) { swf_GetU16(tag); @@ -1119,8 +1247,8 @@ int main (int argc,char ** argv) 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_DEFINESHAPE || tag->id == ST_DEFINESHAPE2 || @@ -1149,6 +1277,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);