X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=a6979003e0458de74f6e0782a9246372b1416366;hb=1f9350818de6a39cb5d8e9ecf6743d815859a20b;hp=0d4babcb6db58500b609747409900a81c95b9c14;hpb=ee7c0f96f3bc1eca68dd4c17dfb0c4b3a404fce4;p=swftools.git diff --git a/src/swfdump.c b/src/swfdump.c index 0d4babc..a697900 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -64,6 +64,7 @@ static struct options_t options[] = { {"e", "html"}, {"a", "action"}, {"t", "text"}, +{"s", "shapes"}, {"p", "placements"}, {"X", "width"}, {"Y", "height"}, @@ -71,7 +72,6 @@ static struct options_t options[] = { {"f", "frames"}, {"d", "hex"}, {"u", "used"}, -{"s", "shapes"}, {0,0} }; @@ -151,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"); @@ -232,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; @@ -338,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; @@ -364,15 +350,15 @@ 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++]); @@ -561,8 +547,10 @@ void handlePlaceObject(TAG*tag, char*prefix) U16 id = swf_GetU16(tag); U16 depth = swf_GetU16(tag); - MATRIX matrix; swf_GetMatrix(tag, &matrix); - CXFORM cxform; swf_GetCXForm(tag, &cxform, 0); + MATRIX matrix; + CXFORM cxform; + swf_GetMatrix(tag, &matrix); + swf_GetCXForm(tag, &cxform, 0); swf_SetU8(tag2, 14); swf_SetU16(tag2, depth); @@ -599,13 +587,14 @@ char* linestyle2str(LINESTYLE*style) void handleShape(TAG*tag, char*prefix) { SHAPE2 shape; + SHAPELINE*line; + int t,max; + tag->pos = 0; tag->readBit = 0; swf_ParseDefineShape(tag, &shape); - SHAPELINE*line; - int t; - int max = shape.numlinestyles > shape.numfillstyles?shape.numlinestyles:shape.numfillstyles; + max = shape.numlinestyles > shape.numfillstyles?shape.numlinestyles:shape.numfillstyles; if(max) printf("%s | fillstyles(%02d) linestyles(%02d)\n", prefix, @@ -619,7 +608,7 @@ void handleShape(TAG*tag, char*prefix) if(t < shape.numfillstyles) { printf(" | %-2d) %-18.18s", t+1, fillstyle2str(&shape.fillstyles[t])); } else { - printf(" "); + printf(" "); } if(t < shape.numlinestyles) { printf("%-2d) %s", t+1, linestyle2str(&shape.linestyles[t])); @@ -651,11 +640,11 @@ void handleShape(TAG*tag, char*prefix) 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++; @@ -676,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) @@ -865,10 +854,10 @@ int main (int argc,char ** argv) if(showtext) { fontnum = 0; - swf_FontEnumerate(&swf,&fontcallback1); + swf_FontEnumerate(&swf,&fontcallback1, 0); fonts = (SWFFONT**)malloc(fontnum*sizeof(SWFFONT*)); fontnum = 0; - swf_FontEnumerate(&swf,&fontcallback2); + swf_FontEnumerate(&swf,&fontcallback2, 0); } while(tag) { @@ -980,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))) ); @@ -1073,6 +1062,12 @@ 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); }