X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=3df34df44689d09012bbc1dd9283536feeaeae14;hb=fc815311aa1bd67877b404493838dfd85a86f596;hp=64db4026f7acd84a8cc73d5a05a797208680ca2d;hpb=6e5f07249bbf427f2a005e2da2eec1b011323501;p=swftools.git diff --git a/src/swfdump.c b/src/swfdump.c index 64db402..3df34df 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -73,8 +73,8 @@ static struct options_t options[] = { {"s", "shapes"}, {"F", "fonts"}, {"p", "placements"}, -{"b", "bbox"}, {"B", "buttons"}, +{"b", "bbox"}, {"X", "width"}, {"Y", "height"}, {"r", "rate"}, @@ -185,6 +185,7 @@ void args_callback_usage(char *name) 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"); @@ -265,6 +266,7 @@ void dumpButtonActions(TAG*tag, char*prefix) } actions = swf_ActionGet(tag); swf_DumpActions(actions, prefix); + swf_ActionFree(actions); } void dumpButton(TAG*tag, char*prefix) @@ -296,7 +298,7 @@ void dumpFont(TAG*tag, char*prefix) { SWFFONT* font = malloc(sizeof(SWFFONT)); memset(font, 0, sizeof(SWFFONT)); - if(tag->id == ST_DEFINEFONT2) { + 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); @@ -341,12 +343,41 @@ void dumpFont(TAG*tag, char*prefix) 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) { @@ -384,10 +415,24 @@ 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) @@ -785,11 +830,13 @@ char* fillstyle2str(FILLSTYLE*style) /* TODO: display information about that 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); @@ -915,13 +962,64 @@ 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;tpos < tag->len) { + printf("%sglyph %d) ", prefix, num++); + int nr = swf_GetU8(tag); // should be 2 + int t; + for(t=0;t3 && !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 && !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"); @@ -1037,9 +1141,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); } @@ -1062,9 +1166,11 @@ int main (int argc,char ** argv) " \n" " \n" " \n" + " \n" " \n" " \n" "\n", xsize, ysize, fileversions[swf.fileVersion], @@ -1122,20 +1228,7 @@ int main (int argc,char ** argv) printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag)); } - 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)); @@ -1176,10 +1269,24 @@ 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); } @@ -1210,7 +1317,7 @@ 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+1) < tag->len) { printf(" has %d extra bytes", tag->len-1-l); @@ -1222,8 +1329,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; @@ -1253,15 +1360,16 @@ int main (int argc,char ** argv) 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); @@ -1279,9 +1387,22 @@ int main (int argc,char ** argv) printf("unknown[%08x],", flags); float thickness = swf_GetFixed(tag); float sharpness = swf_GetFixed(tag); - printf("s=%.2f,t=%.2f)\n", thickness, sharpness); + printf("s=%.2f,t=%.2f)", thickness, sharpness); swf_GetU8(tag); } + 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) { @@ -1310,10 +1431,7 @@ 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_DEFINESCALINGGRID) { U16 id = swf_GetU16(tag); @@ -1367,7 +1485,9 @@ int main (int argc,char ** argv) swf_DumpActions(actions, myprefix); } else if((tag->id == ST_DOABC || tag->id == ST_RAWABC) && action) { - swf_ReadABC(tag); + void*abccode = swf_ReadABC(tag); + swf_DumpABC(stdout, abccode, ""); + swf_FreeABC(abccode); } else if(tag->id == ST_DOINITACTION && action) { ActionTAG*actions; @@ -1397,6 +1517,9 @@ int main (int argc,char ** argv) 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