X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=f2752d1505c695c729fdc7d5d5b59a47fde74a44;hb=a8614ab4906840c51c03b7a4219fba4b45bcd9b0;hp=7ce9773502f78cf3521c78596e4399476bb0263a;hpb=d76c6ece4a8e3d3e5a9ce9a24bf7dcad531b97ed;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 7ce9773..f2752d1 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -319,38 +319,44 @@ void handlePlaceObject2(TAG*tag, char*prefix)
     //flags&1: move
     if(flags&2) swf_GetU16(tag); //id
     if(flags&4) swf_GetMatrix(tag,0);
-    if(flags&8) swf_GetCXForm(tag,0,0);
+    if(flags&8) swf_GetCXForm(tag,0,1);
     if(flags&16) swf_GetU16(tag); //ratio
-    if(flags&32) { 
-	while(swf_GetU8(tag));
-    }
+    if(flags&32) { while(swf_GetU8(tag)); }
     if(flags&64) swf_GetU16(tag); //clip
     if(flags&128) {
       if (action) {
-	U16 globalflags;
 	U16 unknown;
+	U32 globalflags;
+	U32 handlerflags;
+	char is32 = 0;
 	printf("\n");
 	unknown = swf_GetU16(tag);
 	globalflags = swf_GetU16(tag);
-	if(unknown)
+	if(unknown) {
 	    printf("Unknown parameter field not zero: %04x\n", unknown);
-	while(1)  {
+	    return;
+	}
+	printf("global flags: %04x\n", globalflags);
+	handlerflags = swf_GetU16(tag);
+	if(!handlerflags) {
+	    handlerflags = swf_GetU32(tag);
+	    is32 = 1;
+	}
+	while(handlerflags)  {
 	    int length;
 	    int t;
-	    U16 handlerflags;
 	    ActionTAG*a;
-	    handlerflags = swf_GetU16(tag);
-	    if(!handlerflags)
-		break;
+
 	    globalflags &= ~handlerflags;
-	    printf("%s flags %04x ",prefix, handlerflags);
+	    printf("%s flags %08x ",prefix, handlerflags);
 	    printhandlerflags(handlerflags);
-
 	    length = swf_GetU32(tag);
 	    printf(", %d bytes actioncode\n",length);
 	    a = swf_ActionGet(tag);
 	    swf_DumpActions(a,prefix);
 	    swf_ActionFree(a);
+
+	    handlerflags = is32?swf_GetU32(tag):swf_GetU16(tag);
 	}
 	if(globalflags) // should go to sterr.
 	    printf("ERROR: unsatisfied handlerflags: %02x\n", globalflags);
@@ -391,11 +397,12 @@ int main (int argc,char ** argv)
     int f;
     int xsize,ysize;
     char issprite = 0; // are we inside a sprite definition?
-    int spriteframe;
+    int spriteframe = 0;
     int mainframe=0;
-    char* spriteframelabel;
+    char* spriteframelabel = 0;
     char* framelabel = 0;
     char prefix[128];
+    int filesize = 0;
     prefix[0] = 0;
     memset(idtab,0,65536);
 
@@ -423,9 +430,10 @@ int main (int argc,char ** argv)
 
 #ifdef HAVE_STAT
     fstat(f, &statbuf);
-    if(statbuf.st_size != swf.fileSize)
+    if(statbuf.st_size != swf.fileSize && !swf.compressed)
         dumperror("Real Filesize (%d) doesn't match header Filesize (%d)",
                 statbuf.st_size, swf.fileSize);
+    filesize = statbuf.st_size;
 #endif
 
     close(f);
@@ -454,24 +462,39 @@ 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");
+	    exit(1);
+	}
  	printf("<OBJECT CLASSID=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\"\n"
 	       " WIDTH=\"%d\"\n"
+	       //" BGCOLOR=#ffffffff\n"
 	       " HEIGHT=\"%d\"\n"
-	       " CODEBASE=\"http://active.macromedia.com/flash5/cabs/swflash.cab#version=%d,0,0,0\">\n"
+	       " CODEBASE=\"http://active.macromedia.com/flash5/cabs/swflash.cab#version=%s\">\n"
                "  <PARAM NAME=\"MOVIE\" VALUE=\"%s\">\n"
 	       "  <PARAM NAME=\"PLAY\" VALUE=\"true\">\n" 
 	       "  <PARAM NAME=\"LOOP\" VALUE=\"true\">\n"
 	       "  <PARAM NAME=\"QUALITY\" VALUE=\"high\">\n"
-	       "  <EMBED SRC=\"%s\" WIDTH=\"%d\" HEIGHT=\"%d\"\n"
-	       "   PLAY=\"true\" LOOP=\"true\" QUALITY=\"high\"\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"
-	       "   PLUGINSPAGE=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\">\n"
+	       "   PLUGINSPAGE=\"http://www.macromedia.com/go/getflashplayer\">\n"
                "  </EMBED>\n" 
-	       "</OBJECT>\n", xsize, ysize, swf.fileVersion, filename, filename, xsize, ysize);
+	       "</OBJECT>\n", xsize, ysize, fileversions[swf.fileVersion], 
+		              filename, filename, xsize, ysize);
 	return 0;
     } 
     printf("[HEADER]        File version: %d\n", swf.fileVersion);
-    printf("[HEADER]        File size: %ld\n", swf.fileSize);
+    if(swf.compressed) {
+	printf("[HEADER]        File is zlib compressed.");
+	if(filesize && swf.fileSize)
+	    printf(" Ratio: %02d%%\n", filesize*100/(swf.fileSize));
+	else
+	    printf("\n");
+    }
+    printf("[HEADER]        File size: %ld%s\n", swf.fileSize, swf.compressed?" (Depacked)":"");
     printf("[HEADER]        Frame rate: %f\n",swf.frameRate/256.0);
     printf("[HEADER]        Frame count: %d\n",swf.frameCount);
     printf("[HEADER]        Movie width: %.3f\n",(swf.movieSize.xmax-swf.movieSize.xmin)/20.0);
@@ -545,7 +568,13 @@ int main (int argc,char ** argv)
 	    printf(" starts id %04d", swf_GetPlaceID(tag));
 	}
 	else if(tag->id == ST_FRAMELABEL) {
+	    int l = strlen(tag->data);
 	    printf(" \"%s\"", tag->data);
+	    if(l < tag->len-1) {
+		printf(" has %d extra bytes", tag->len-1-l);
+		if(tag ->len-1-l == 1 && tag->data[tag->len-1] == 1)
+		    printf(" (ANCHOR)");
+	    }
 	    if((framelabel && !issprite) ||
 	       (spriteframelabel && issprite)) {
 		dumperror("Frame %d has more than one label",