X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=32570592fc2adff47a806c0fd28351c06e5b514c;hb=db99ef512ada86d96c60c2ff07e816ee2eae859a;hp=e434ceb41034b5a5c804fae2e2070b9aa85a70fb;hpb=9f9d321b0db0fa20cc08904220d7f3a89415cc59;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index e434ceb..3257059 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -58,6 +58,7 @@ static int showshapes = 0;
 static int hex = 0;
 static int used = 0;
 static int bbox = 0;
+static int cumulative = 0;
 
 static struct options_t options[] = {
 {"h", "help"},
@@ -105,6 +106,10 @@ int args_callback_option(char*name,char*val)
         html = 1;
         return 0;
     }
+    else if(name[0]=='c') {
+        cumulative = 1;
+        return 0;
+    }
     else if(name[0]=='E') {
         html = 1;
         xhtml = 1;
@@ -162,6 +167,7 @@ void args_callback_usage(char *name)
     printf("-D , --full                    Show everything. Same as -atp\n");
     printf("-V , --version                 Print version info and exit\n");
     printf("-e , --html                    Print out html code for embedding the file\n");
+    printf("-E , --xhtml                   Print out xhtml 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");
@@ -270,8 +276,12 @@ void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fonts
 	    if(glyphs[t] >= fonts[font]->numchars  /*glyph is in range*/
 		    || !fonts[font]->glyph2ascii /* font has ascii<->glyph mapping */
 	      ) a = glyphs[t];
-	    else
-		a = fonts[font]->glyph2ascii[glyphs[t]];
+	    else {
+		if(fonts[font]->glyph2ascii[glyphs[t]])
+		    a = fonts[font]->glyph2ascii[glyphs[t]];
+		else
+		    a = glyphs[t];
+	    }
 	} else {
 	    a = glyphs[t];
 	}
@@ -293,7 +303,7 @@ void handleDefineSound(TAG*tag)
 {
     U16 id = swf_GetU16(tag);
     U8 flags = swf_GetU8(tag);
-    int compression = (flags>>4)&3;
+    int compression = (flags>>4)&7;
     int rate = (flags>>2)&3;
     int bits = flags&2?16:8;
     int stereo = flags&1;
@@ -301,6 +311,8 @@ void handleDefineSound(TAG*tag)
     if(compression == 0) printf("Raw ");
     else if(compression == 1) printf("ADPCM ");
     else if(compression == 2) printf("MP3 ");
+    else if(compression == 3) printf("Raw little-endian ");
+    else if(compression == 6) printf("ASAO ");
     else printf("? ");
     if(rate == 0) printf("5.5Khz ");
     if(rate == 1) printf("11Khz ");
@@ -561,12 +573,12 @@ void handlePlaceObject(TAG*tag, char*prefix)
 {
     TAG*tag2 = swf_InsertTag(0, ST_PLACEOBJECT2);
     U16 id, depth;
+    MATRIX matrix; 
+    CXFORM cxform;
 
     swf_SetTagPos(tag, 0);
     id = swf_GetU16(tag);
     depth = swf_GetU16(tag);
-    MATRIX matrix; 
-    CXFORM cxform;
     swf_GetMatrix(tag, &matrix);
     swf_GetCXForm(tag, &cxform, 0);
 
@@ -588,9 +600,15 @@ char* fillstyle2str(FILLSTYLE*style)
 	case 0x10: case 0x12:
 	    sprintf(stylebuf, "GRADIENT (%d steps)", style->gradient.num);
 	    break;
-	case 0x40: case 0x41:
+	case 0x40: 
+	    /* TODO: display information about that bitmap */
+	    sprintf(stylebuf, "BITMAPt %d", style->id_bitmap);
+	    /* TODO: show matrix */
+	    break;
+	case 0x41:
 	    /* TODO: display information about that bitmap */
-	    sprintf(stylebuf, "BITMAP %d", style->id_bitmap);
+	    sprintf(stylebuf, "BITMAPc %d", style->id_bitmap);
+	    /* TODO: show matrix */
 	    break;
 	default:
 	    sprintf(stylebuf, "UNKNOWN[%02x]",style->type);
@@ -755,6 +773,7 @@ int main (int argc,char ** argv)
     char* framelabel = 0;
     char prefix[128];
     int filesize = 0;
+    int filepos = 0;
     prefix[0] = 0;
     memset(idtab,0,65536);
 
@@ -898,17 +917,16 @@ int main (int argc,char ** argv)
             //tag = tag->next;
             //continue;
         }
-	if(swf_TagGetName(tag)) {
-	    printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
+	if(!name) {
+	    name = "UNKNOWN TAG";
+	}
+	if(cumulative) {
+	    filepos += tag->len;
+	    printf("[%03x] %9ld %9ld %s%s", tag->id, tag->len, filepos, prefix, swf_TagGetName(tag));
 	} else {
-	    printf("[%03x] %9ld %sUNKNOWN TAG %03x", tag->id, tag->len, prefix, tag->id);
+	    printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
 	}
 	
-	if(tag->id == ST_FREECHARACTER) {
-	    U16 id = swf_GetU16(tag);
-	    idtab[id] = 0;
-	}
-
         if(swf_isDefiningTag(tag)) {
             U16 id = swf_GetDefineID(tag);
             printf(" defines id %04d", id);
@@ -982,9 +1000,9 @@ int main (int argc,char ** argv)
 	else if(tag->id == ST_FRAMELABEL) {
 	    int l = strlen(tag->data);
 	    printf(" \"%s\"", tag->data);
-	    if(l < tag->len-1) {
+	    if((l+1) < tag->len) {
 		printf(" has %d extra bytes", tag->len-1-l);
-		if(tag ->len-1-l == 1 && tag->data[tag->len-1] == 1)
+		if(tag ->len - (l+1) == 1 && tag->data[tag->len-1] == 1)
 		    printf(" (ANCHOR)");
 	    }
 	    if((framelabel && !issprite) ||
@@ -1155,6 +1173,13 @@ int main (int argc,char ** argv)
 		printf("\n");
 	    }
 	}
+	
+	if(tag->id == ST_FREECHARACTER) {
+	    U16 id;
+	    swf_SetTagPos(tag, 0);
+	    id = swf_GetU16(tag);
+	    idtab[id] = 0;
+	}
 
 	if(tag->len && hex) {
 	    hexdumpTag(tag, prefix);