X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=a6979003e0458de74f6e0782a9246372b1416366;hb=1f9350818de6a39cb5d8e9ecf6743d815859a20b;hp=038104b4f76bc0d7c0e71faf1d8f3d141fdad3bb;hpb=66069591a4e556520c60c4cf1e0b47b70a99b7ca;p=swftools.git diff --git a/src/swfdump.c b/src/swfdump.c index 038104b..a697900 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -53,6 +53,7 @@ static int action = 0; static int html = 0; static int xy = 0; static int showtext = 0; +static int showshapes = 0; static int hex = 0; static int used = 0; @@ -63,6 +64,7 @@ static struct options_t options[] = { {"e", "html"}, {"a", "action"}, {"t", "text"}, +{"s", "shapes"}, {"p", "placements"}, {"X", "width"}, {"Y", "height"}, @@ -91,6 +93,10 @@ int args_callback_option(char*name,char*val) showtext = 1; return 0; } + else if(name[0]=='s') { + showshapes = 1; + return 0; + } else if(name[0]=='e') { html = 1; return 0; @@ -120,7 +126,7 @@ int args_callback_option(char*name,char*val) return 0; } else if(name[0]=='D') { - action = placements = showtext = 1; + action = placements = showtext = showshapes = 1; return 0; } else { @@ -145,6 +151,7 @@ void args_callback_usage(char *name) 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("-s , --shapes Show shape coordinates/styles\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"); @@ -226,23 +233,6 @@ void dumpButtonActions(TAG*tag, char*prefix) swf_DumpActions(actions, prefix); } -#define ET_HASTEXT 32768 -#define ET_WORDWRAP 16384 -#define ET_MULTILINE 8192 -#define ET_PASSWORD 4096 -#define ET_READONLY 2048 -#define ET_HASTEXTCOLOR 1024 -#define ET_HASMAXLENGTH 512 -#define ET_HASFONT 256 -#define ET_X3 128 -#define ET_X2 64 -#define ET_HASLAYOUT 32 -#define ET_NOSELECT 16 -#define ET_BORDER 8 -#define ET_X1 4 -#define ET_X0 2 -#define ET_USEOUTLINES 1 - SWF swf; int fontnum = 0; SWFFONT**fonts; @@ -332,7 +322,9 @@ void handleEditText(TAG*tag) int t; id = swf_GetU16(tag); swf_GetRect(tag,0); + //swf_ResetReadBits(tag); + if (tag->readBit) { tag->pos++; tag->readBit = 0; @@ -358,20 +350,20 @@ void handleEditText(TAG*tag) swf_GetU16(tag); //indent swf_GetU16(tag); //leading } - printf(" variable \"%s\"", &tag->data[tag->pos]); + printf(" variable \"%s\" ", &tag->data[tag->pos]); + if(flags & ET_HTML) printf("(html)"); + if(flags & ET_NOSELECT) printf("(noselect)"); + if(flags & ET_PASSWORD) printf("(password)"); + if(flags & ET_READONLY) printf("(readonly)"); - if(flags & (ET_X1 | ET_X2 | ET_X3 | ET_X0)) + if(flags & (ET_X1 | ET_X3 )) { - printf(" undefined flags: %d%d%d%d", - (flags&ET_X0?1:0), - (flags&ET_X1?1:0), - (flags&ET_X2?1:0), - (flags&ET_X3?1:0)); + printf(" undefined flags: %08x (%08x)", (flags&(ET_X1|ET_X3)), flags); } while(tag->data[tag->pos++]); if(flags & ET_HASTEXT) - // printf(" text \"%s\"\n", &tag->data[tag->pos]) + // printf(" text \"%s\"\n", &tag->data[tag->pos]) //TODO ; } void printhandlerflags(U32 handlerflags) @@ -551,14 +543,108 @@ void handlePlaceObject2(TAG*tag, char*prefix) void handlePlaceObject(TAG*tag, char*prefix) { - /*TODO*/ + TAG*tag2 = swf_InsertTag(0, ST_PLACEOBJECT2); + + U16 id = swf_GetU16(tag); + U16 depth = swf_GetU16(tag); + MATRIX matrix; + CXFORM cxform; + swf_GetMatrix(tag, &matrix); + swf_GetCXForm(tag, &cxform, 0); + + swf_SetU8(tag2, 14); + swf_SetU16(tag2, depth); + swf_SetMatrix(tag2, &matrix); + swf_SetCXForm(tag2, &cxform, 1); + + handlePlaceObject2(tag2, prefix); +} +char stylebuf[256]; +char* fillstyle2str(FILLSTYLE*style) +{ + switch(style->type) { + 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: + sprintf(stylebuf, "GRADIENT (%d steps)", style->gradient.num); + break; + case 0x40: case 0x41: + /* TODO: display information about that bitmap */ + sprintf(stylebuf, "BITMAP %d", style->id_bitmap); + break; + default: + sprintf(stylebuf, "UNKNOWN[%02x]",style->type); + } + return stylebuf; +} +char* linestyle2str(LINESTYLE*style) +{ + sprintf(stylebuf, "%.2f %02x%02x%02x%02x", style->width/20.0, style->color.r, style->color.g, style->color.b, style->color.a); + return stylebuf; +} + +void handleShape(TAG*tag, char*prefix) +{ + SHAPE2 shape; + SHAPELINE*line; + int t,max; + + tag->pos = 0; + tag->readBit = 0; + swf_ParseDefineShape(tag, &shape); + + max = shape.numlinestyles > shape.numfillstyles?shape.numlinestyles:shape.numfillstyles; + + if(max) printf("%s | fillstyles(%02d) linestyles(%02d)\n", + prefix, + shape.numfillstyles, + shape.numlinestyles + ); + else printf("%s | (Neither line nor fill styles)\n", prefix); + + for(t=0;tfillstyle0, + line->fillstyle1, + line->linestyle); + if(line->type == moveTo) { + printf("moveTo %.2f %.2f\n", line->x/20.0, line->y/20.0); + } else if(line->type == lineTo) { + printf("lineTo %.2f %.2f\n", line->x/20.0, line->y/20.0); + } else if(line->type == splineTo) { + printf("splineTo (%.2f %.2f) %.2f %.2f\n", + line->sx/20.0, line->sy/20.0, + line->x/20.0, line->y/20.0 + ); + } + line = line->next; + } + printf("%s |\n", prefix); } -void fontcallback1(U16 id,U8 * name) +void fontcallback1(void*self, U16 id,U8 * name) { fontnum++; } -void fontcallback2(U16 id,U8 * name) +void fontcallback2(void*self, U16 id,U8 * name) { swf_FontExtract(&swf,id,&fonts[fontnum]); fontnum++; @@ -579,9 +665,9 @@ void hexdumpTag(TAG*tag, char* prefix) ascii[t&15] = printable(tag->data[t]); if((t && ((t&15)==15)) || (t==tag->len-1)) { - int s,p=((t-1)&15)+1; + int s,p=((t)&15)+1; ascii[p] = 0; - for(s=p;s<16;s++) { + for(s=p-1;s<16;s++) { printf(" "); } if(t==tag->len-1) @@ -718,9 +804,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"}; - if(swf.fileVersion>8) { - fprintf(stderr, "Fileversion>8\n"); + "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"); exit(1); } printf("id == ST_PLACEOBJECT2) { if(tag->data[0]&1) @@ -884,9 +969,9 @@ int main (int argc,char ** argv) } } if(nframe == frame) - printf(" %d (%s)", frame, timestring(frame*(256.0/(swf.frameRate+0.1)))); + printf(" %d (%s)", frame+1, timestring(frame*(256.0/(swf.frameRate+0.1)))); else - printf(" %d-%d (%s-%s)", frame, nframe, + printf(" %d-%d (%s-%s)", frame+1, nframe+1, timestring(frame*(256.0/(swf.frameRate+0.1))), timestring(nframe*(256.0/(swf.frameRate+0.1))) ); @@ -905,6 +990,8 @@ int main (int argc,char ** argv) else if(tag->id == ST_PROTECT) { if(tag->len>0) { printf(" %s\n", swf_GetString(tag)); + } else { + printf("\n"); } } else if(tag->id == ST_DEFINEBITSLOSSLESS || @@ -975,15 +1062,30 @@ int main (int argc,char ** argv) actions = swf_ActionGet(tag); swf_DumpActions(actions, myprefix); } + 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_DEFINEBUTTON2 && 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_DEFINESHAPE || + tag->id == ST_DEFINESHAPE2 || + tag->id == ST_DEFINESHAPE3) { + if(showshapes) + handleShape(tag, myprefix); + } if(tag->len && used) { int num = swf_GetNumUsedIDs(tag);