X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=d65e625091dc94a52dffd02f6947a7f61d4fc43e;hb=aab59bee1b79b487e2a15ec57a80a857ffd623a5;hp=a77e4136aecc9cd2b92b459fdf7c6faaea00ccfe;hpb=86ac28a39ddcee6967ebcefc2645a5c849d52087;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index a77e413..d65e625 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)
@@ -341,6 +343,35 @@ 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;t<font->maxascii;t++) {
+        if((t&15)==0) {
+            printf("\n%s%08x ", prefix, t);
+            int s;
+            if(!filled0 && t) {
+                for(s=t;s<font->maxascii;s++) {
+                    if(font->ascii2glyph[s]>=0) break;
+                }
+                if(s>t+32) {
+                    printf("*");
+                    t = ((s-16)&~15)-1;
+                    continue;
+                }
+            }
+            filled0 = 0;
+            for(s=t;s<t+16 && s<font->maxascii;s++) {
+                if(font->ascii2glyph[s]>=0) filled0=1;
+            }
+        }
+        printf("%4d ", font->ascii2glyph[t]);
+    }
+    printf("\n");*/
+
     swf_FontFree(font);
 }
 
@@ -923,7 +954,7 @@ void dumperror(const char* format, ...)
     va_list arglist;
 
     va_start(arglist, format);
-    vsprintf(buf, format, arglist);
+    vsnprintf(buf, sizeof(buf)-1, format, arglist);
     va_end(arglist);
 
     if(!html && !xy)
@@ -976,32 +1007,38 @@ int main (int argc,char ** argv)
     if (f<0)
     { 
 	char buffer[256];
-	sprintf(buffer, "Couldn't open %s", filename);
+	sprintf(buffer, "Couldn't open %.200s", filename);
         perror(buffer);
         exit(1);
     }
     char header[3];
     read(f, header, 3);
-    int compressed = (header[0]=='C');
+    char compressed = (header[0]=='C');
+    char isflash = (header[0]=='F' && header[1] == 'W' && header[2] == 'S') ||
+                   (header[0]=='C' && header[1] == 'W' && header[2] == 'S');
     close(f);
-    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);
-    }
+    int fl=strlen(filename);
+    if(!isflash && fl>3 && !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");
@@ -1039,9 +1076,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);
 	}
 
@@ -1064,9 +1101,11 @@ int main (int argc,char ** argv)
 		   "  <PARAM NAME=\"PLAY\" VALUE=\"true\">\n" 
 		   "  <PARAM NAME=\"LOOP\" VALUE=\"true\">\n"
 		   "  <PARAM NAME=\"QUALITY\" VALUE=\"high\">\n"
+		   "  <PARAM NAME=\"ALLOWSCRIPTACCESS\" VALUE=\"always\">\n"
 		   "  <EMBED SRC=\"%s\" WIDTH=\"%d\" HEIGHT=\"%d\"\n" //bgcolor=#ffffff?
 		   "   PLAY=\"true\" ALIGN=\"\" LOOP=\"true\" QUALITY=\"high\"\n"
 		   "   TYPE=\"application/x-shockwave-flash\"\n"
+                   "   ALLOWSCRIPTACCESS=\"always\"\n"
 		   "   PLUGINSPAGE=\"http://www.macromedia.com/go/getflashplayer\">\n"
 		   "  </EMBED>\n" 
 		   "</OBJECT>\n", xsize, ysize, fileversions[swf.fileVersion], 
@@ -1178,10 +1217,22 @@ 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&1) printf(" usenetwork");
+            if(flags&8) printf(" as3");
+            if(flags&16) printf(" symbolclass");
+            if(flags&~(1|8|16))
+                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);
             }