fixed compiler warnings

[swftools.git] / src / swfdump.c

diff --git a/src/swfdump.c b/src/swfdump.c
index 20dc98f..9b58e2d 100644 (file)
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -4,8 +4,20 @@
    Part of the swftools package.
    
    Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-   This file is distributed under the GPL, see file COPYING for details */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "../config.h"
 
@@ -56,7 +68,6 @@ struct options_t options[] =
  {"e","html"},
  {"p","placements"},
  {"u","used"},
- {"v","verbose"},
  {"V","version"},
  {"d","hex"},
  {0,0}
@@ -361,7 +372,7 @@ void handleEditText(TAG*tag)
    //  printf(" text \"%s\"\n", &tag->data[tag->pos])
        ;
 }
-void printhandlerflags(U16 handlerflags) 
+void printhandlerflags(U32 handlerflags) 
 {
     if(handlerflags&1) printf("[on load]");
     if(handlerflags&2) printf("[enter frame]");
@@ -371,8 +382,20 @@ void printhandlerflags(U16 handlerflags)
     if(handlerflags&32) printf("[mouse up]");
     if(handlerflags&64) printf("[key down]");
     if(handlerflags&128) printf("[key up]");
+
     if(handlerflags&256) printf("[data]");
-    if(handlerflags&0xfe00) printf("[???]");
+    if(handlerflags&512) printf("[initialize]");
+    if(handlerflags&1024) printf("[mouse press]");
+    if(handlerflags&2048) printf("[mouse release]");
+    if(handlerflags&4096) printf("[mouse release outside]");
+    if(handlerflags&8192) printf("[mouse rollover]");
+    if(handlerflags&16384) printf("[mouse rollout]");
+    if(handlerflags&32768) printf("[mouse drag over]");
+
+    if(handlerflags&0x10000) printf("[mouse drag out]");
+    if(handlerflags&0x20000) printf("[key press]");
+    if(handlerflags&0x40000) printf("[construct even]");
+    if(handlerflags&0xfff80000) printf("[???]");
 }
 void handleVideoStream(TAG*tag, char*prefix)
 {
@@ -393,7 +416,7 @@ void handleVideoStream(TAG*tag, char*prefix)
 void handleVideoFrame(TAG*tag, char*prefix)
 {
     U32 code, version, reference, sizeflags;
-    U32 width, height;
+    U32 width=0, height=0;
     U8 type;
     U16 id = swf_GetU16(tag);
     U16 frame = swf_GetU16(tag);
@@ -481,19 +504,20 @@ void handlePlaceObject2(TAG*tag, char*prefix)
     }
     if(flags&128) {
       if (action) {
-       U16 unknown;
+       U16 reserved;
        U32 globalflags;
        U32 handlerflags;
        char is32 = 0;
        printf("\n");
-       unknown = swf_GetU16(tag);
-       globalflags = swf_GetU16(tag);
-       if(unknown) {
-           printf("Unknown parameter field not zero: %04x\n", unknown);
+       reserved = swf_GetU16(tag); // must be 0
+       globalflags = swf_GetU16(tag); //TODO: 32 if version>=6
+       if(reserved) {
+           printf("Unknown parameter field not zero: %04x\n", reserved);
            return;
        }
        printf("global flags: %04x\n", globalflags);
-       handlerflags = swf_GetU16(tag);
+
+       handlerflags = swf_GetU16(tag); //TODO: 32 if version>=6
        if(!handlerflags) {
            handlerflags = swf_GetU32(tag);
            is32 = 1;
@@ -512,7 +536,7 @@ void handlePlaceObject2(TAG*tag, char*prefix)
            swf_DumpActions(a,prefix);
            swf_ActionFree(a);
 
-           handlerflags = is32?swf_GetU32(tag):swf_GetU16(tag);
+           handlerflags = is32?swf_GetU32(tag):swf_GetU16(tag); //TODO: 32 if version>=6
        }
        if(globalflags) // should go to sterr.
            printf("ERROR: unsatisfied handlerflags: %02x\n", globalflags);
@@ -537,18 +561,30 @@ void fontcallback2(U16 id,U8 * name)
   fontnum++;
 }
 
+static U8 printable(U8 a)
+{
+    if(a<32 || a==127) return '.';
+    else return a;
+}
 void hexdumpTag(TAG*tag, char* prefix)
 {
     int t;
+    char ascii[32];
     printf("                %s-=> ",prefix);
     for(t=0;t<tag->len;t++) {
        printf("%02x ", tag->data[t]);
+       ascii[t&15] = printable(tag->data[t]);
        if((t && ((t&15)==15)) || (t==tag->len-1))
        {
+           int s,p=((t-1)&15)+1;
+           ascii[p] = 0;
+           for(s=p;s<16;s++) {
+               printf("   ");
+           }
            if(t==tag->len-1)
-               printf("\n");
+               printf(" %s\n", ascii);
            else
-               printf("\n                %s-=> ",prefix);
+               printf(" %s\n                %s-=> ",ascii,prefix);
        }
     }
 }
@@ -626,7 +662,9 @@ int main (int argc,char ** argv)
 
     if (f<0)
     { 
-        perror("Couldn't open file: ");
+       char buffer[256];
+       sprintf(buffer, "Couldn't open %s", filename);
+        perror(buffer);
         exit(1);
     }
     if FAILED(swf_ReadSWF(f,&swf))
@@ -738,10 +776,14 @@ int main (int argc,char ** argv)
         char myprefix[128];
         if(!name) {
             dumperror("Unknown tag:0x%03x", tag->id);
-            tag = tag->next;
-            continue;
+            //tag = tag->next;
+            //continue;
         }
-        printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
+       if(swf_TagGetName(tag)) {
+           printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
+       } else {
+           printf("[%03x] %9ld %sUNKNOWN TAG %03x", tag->id, tag->len, prefix, tag->id);
+       }
        
        if(tag->id == ST_FREECHARACTER) {
            U16 id = swf_GetU16(tag);
@@ -857,6 +899,11 @@ int main (int argc,char ** argv)
            U8 b = swf_GetU8(tag);
            printf(" (%02x/%02x/%02x)\n",r,g,b);
        }
+       else if(tag->id == ST_PROTECT) {
+           if(tag->len>0) {
+               printf(" %s\n", swf_GetString(tag));
+           }
+       }
        else if(tag->id == ST_DEFINEBITSLOSSLESS ||
           tag->id == ST_DEFINEBITSLOSSLESS2) {
            handleDefineBits(tag);