X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=3940141a799c7a3ff150eefbda8e901798760bd7;hb=1bf3af9b2db2552fbaa5a02e2a824f0946499aec;hp=0d4babcb6db58500b609747409900a81c95b9c14;hpb=ee7c0f96f3bc1eca68dd4c17dfb0c4b3a404fce4;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 0d4babc..3940141 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");
@@ -561,8 +562,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 +602,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 +623,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 +655,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 +680,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 +869,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 +984,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 +1077,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);
 	}