X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=aeb0733d5e56d593f15a640033511f439fa99295;hb=b9c0bd0865006169c32be33c4ebb3f6d98f4a428;hp=2f80c888a4b48f17ac6706ef072fb952db1e218a;hpb=607c5dadd6089768b618cc99346de1b37a2c46f1;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index 2f80c88..aeb0733 100644
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -24,13 +24,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "mem.h"
 #include "rfxswf.h"
-
-#ifdef HAVE_JPEGLIB
-#define HAVE_BOOLEAN
-#include <jpeglib.h>
-#endif // HAVE_JPEGLIB
-
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 #endif // HAVE_ZLIB
@@ -45,90 +40,12 @@
 #include <time.h>
 #endif
 
-#include "./bitio.h"
-#include "./MD5.h"
-
-// memory allocation
-
-void* rfx_alloc(int size)
-{
-  void*ptr;
-  if(size == 0) {
-    //*(int*)0 = 0xdead;
-    //fprintf(stderr, "Warning: Zero alloc\n");
-    return 0;
-  }
-
-  ptr = malloc(size);
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory\n");
-    /* TODO: we should send a signal, so that the debugger kicks in */
-    exit(1);
-  }
-  return ptr;
-}
-void* rfx_realloc(void*data, int size)
-{
-  void*ptr;
-  if(size == 0) {
-    //*(int*)0 = 0xdead;
-    //fprintf(stderr, "Warning: Zero realloc\n");
-    rfx_free(data);
-    return 0;
-  }
-  if(!data) {
-    ptr = malloc(size);
-  } else {
-    ptr = realloc(data, size);
-  }
-
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory\n");
-    /* TODO: we should send a signal, so that the debugger kicks in */
-    exit(1);
-  }
-  return ptr;
-}
-void* rfx_calloc(int size)
-{
-  void*ptr;
-  if(size == 0) {
-    //*(int*)0 = 0xdead;
-    //fprintf(stderr, "Warning: Zero alloc\n");
-    return 0;
-  }
-#ifdef HAVE_CALLOC
-  ptr = calloc(size);
-#else
-  ptr = malloc(size);
+#ifdef HAVE_IO_H
+#include <io.h>
 #endif
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory\n");
-    /* TODO: we should send a signal, so that the debugger kicks in */
-    exit(1);
-  }
-#ifndef HAVE_CALLOC
-  memset(ptr, 0, size);
-#endif
-  return ptr;
-}
-
-void rfx_free(void*ptr)
-{
-  if(!ptr)
-    return;
-  free(ptr);
-}
-
-#ifdef MEMORY_INFO
-long rfx_memory_used()
-{
-}
 
-char* rfx_memory_used_str()
-{
-}
-#endif
+#include "./bitio.h"
+#include "./MD5.h"
 
 // internal constants
 
@@ -146,11 +63,6 @@ U32   swf_GetTagLen(TAG * t) { return t->len; }
 U8*   swf_GetTagLenPtr(TAG * t) { return &(t->data[t->len]); }
 U32   swf_GetTagPos(TAG * t)   { return t->pos; }
 
-// for future purpose: avoid high level lib functions to change tagpos/bitpos
-
-#define swf_SaveTagPos(tag)
-#define swf_RestoreTagPos(tag)
-
 void swf_SetTagPos(TAG * t,U32 pos)
 { swf_ResetReadBits(t);
   if (pos<=t->len) t->pos = pos;
@@ -163,9 +75,18 @@ void swf_SetTagPos(TAG * t,U32 pos)
 
 char* swf_GetString(TAG*t)
 {
-    char* str = ((char*)(&(t)->data[(t)->pos]));
-    while(swf_GetU8(t));
-    return str;
+    int pos = t->pos;
+    while(t->pos < t->len && swf_GetU8(t));
+    /* make sure we always have a trailing zero byte */
+    if(t->pos == t->len) {
+      if(t->len == t->memsize) {
+	swf_ResetWriteBits(t);
+	swf_SetU8(t, 0);
+	t->len = t->pos;
+      }
+      t->data[t->len] = 0;
+    }
+    return (char*)&(t->data[pos]);
 }
 
 U8 swf_GetU8(TAG * t)
@@ -218,7 +139,7 @@ int swf_GetBlock(TAG * t,U8 * b,int l)
   return l;
 }
 
-int swf_SetBlock(TAG * t,U8 * b,int l)
+int swf_SetBlock(TAG * t,const U8 * b,int l)
 // Appends Block to the end of Tagdata, returns size
 { U32 newlen = t->len + l;
   swf_ResetWriteBits(t);
@@ -305,10 +226,10 @@ S32 swf_GetSBits(TAG * t,int nbits)
   return (S32)res;
 }
 
-U32 reader_GetBits(struct reader_t*reader, int nbits)
+U32 reader_GetBits(reader_t*reader, int nbits)
 { return reader_readbits(reader, nbits);
 }
-S32 reader_GetSBits(struct reader_t*reader, int nbits)
+S32 reader_GetSBits(reader_t*reader, int nbits)
 { U32 res = reader_readbits(reader, nbits);
   if (res&(1<<(nbits-1))) res|=(0xffffffff<<nbits);  
   return (S32)res;
@@ -332,6 +253,31 @@ int swf_SetBits(TAG * t,U32 v,int nbits)
 
 // Advanced Data Access Functions
 
+double swf_GetFixed(TAG * t)
+{
+  U16 low =  swf_GetU16(t);
+  U16 high = swf_GetU16(t);
+  return high + low*(1/65536.0);
+}
+void swf_SetFixed(TAG * t, double f)
+{
+  U16 fr = (U16)((f-(int)f)*65536);
+  swf_SetU16(t, fr);
+  swf_SetU16(t, (U16)f - (f<0 && fr!=0));
+}
+float swf_GetFixed8(TAG * t)
+{
+  U8 low =  swf_GetU8(t);
+  U8 high = swf_GetU8(t);
+  return (float)(high + low*(1/256.0));
+}
+void swf_SetFixed8(TAG * t, float f)
+{
+  U8 fr = (U8)((f-(int)f)*256);
+  swf_SetU8(t, fr);
+  swf_SetU8(t, (U8)f - (f<0 && fr!=0));
+}
+
 int swf_SetRGB(TAG * t,RGBA * col)
 { if (!t) return -1;
   if (col)
@@ -375,25 +321,29 @@ void swf_GetRGBA(TAG * t, RGBA * col)
 
 void swf_GetGradient(TAG * tag, GRADIENT * gradient, char alpha)
 {
-    GRADIENT dummy;
     int t;
     if(!tag) {
       memset(gradient, 0, sizeof(GRADIENT));
       return;
     }
-    if(!gradient)
-	gradient = &dummy;
-    gradient->num = swf_GetU8(tag);
-    for(t=0;t<gradient->num;t++)
+    U8 num = swf_GetU8(tag) & 15;
+    if(gradient) {
+	gradient->num = num;
+	gradient->rgba = (RGBA*)rfx_calloc(sizeof(RGBA)*gradient->num);
+	gradient->ratios = (U8*)rfx_calloc(sizeof(gradient->ratios[0])*gradient->num);
+    }
+    for(t=0;t<num;t++)
     {
-	int s=t;
-	if(s>=8) //FIXME
-	    s=7;
-	gradient->ratios[t] = swf_GetU8(tag);
+	U8 ratio = swf_GetU8(tag);
+	RGBA color;
 	if(!alpha)
-	    swf_GetRGB(tag, &gradient->rgba[t]);
+	    swf_GetRGB(tag, &color);
 	else
-	    swf_GetRGBA(tag, &gradient->rgba[t]);
+	    swf_GetRGBA(tag, &color);
+	if(gradient) {
+	  gradient->ratios[t] = ratio;
+	  gradient->rgba[t] = color;
+	}
     }
 }
 
@@ -415,6 +365,15 @@ void swf_SetGradient(TAG * tag, GRADIENT * gradient, char alpha)
     }
 }
 
+void swf_FreeGradient(GRADIENT* gradient)
+{
+  if(gradient->ratios)
+    rfx_free(gradient->ratios);
+  if(gradient->rgba)
+    rfx_free(gradient->rgba);
+  memset(gradient, 0, sizeof(GRADIENT));
+}
+
 int swf_CountUBits(U32 v,int nbits)
 { int n = 32;
   U32 m = 0x80000000;
@@ -462,7 +421,7 @@ int swf_GetRect(TAG * t,SRECT * r)
   return 0;
 }
 
-int reader_GetRect(struct reader_t*reader,SRECT * r)
+int reader_GetRect(reader_t*reader,SRECT * r)
 { int nbits;
   SRECT dummy;
   if (!r) r = &dummy;
@@ -495,6 +454,20 @@ int swf_SetRect(TAG * t,SRECT * r)
   return 0;
 }
 
+SRECT swf_ClipRect(SRECT border, SRECT r)
+{
+    if(r.xmax > border.xmax) r.xmax = border.xmax;
+    if(r.ymax > border.ymax) r.ymax = border.ymax;
+    if(r.xmax < border.xmin) r.xmax = border.xmin;
+    if(r.ymax < border.ymin) r.ymax = border.ymin;
+    
+    if(r.xmin > border.xmax) r.xmin = border.xmax;
+    if(r.ymin > border.ymax) r.ymin = border.ymax;
+    if(r.xmin < border.xmin) r.xmin = border.xmin;
+    if(r.ymin < border.ymin) r.ymin = border.ymin;
+    return r;
+}
+
 void swf_ExpandRect(SRECT*src, SPOINT add)
 {
     if((src->xmin | src->ymin | src->xmax | src->ymax)==0) {
@@ -633,6 +606,7 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
     nbits = swf_CountBits(m->sx,0);
     nbits = swf_CountBits(m->sy,nbits);
     if(nbits>=32) {
+        /* TODO: happens on AMD64 systems for normal values? */
 	fprintf(stderr,"rfxswf: Error: matrix values too large\n");
 	nbits = 31;
     }
@@ -668,7 +642,7 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
   return 0;
 }
 
-int swf_GetCXForm(TAG * t,CXFORM * cx,U8 alpha) //FIXME: alpha should be type bool
+int swf_GetCXForm(TAG * t,CXFORM * cx,U8 alpha)
 { CXFORM cxf;
   int hasadd;
   int hasmul;
@@ -782,18 +756,19 @@ void  swf_SetPassword(TAG * t, const char * password)
     fprintf(stderr, "rfxswf: Warning- no usable random generator found\n");
     fprintf(stderr, "Your password will be vulnerable to dictionary attacks\n");
 #endif
+    salt[2] = 0;
     
     md5string = crypt_md5(password, salt);
 
     swf_SetU16(t,0);
-    swf_SetString(t, md5string);
+    swf_SetString(t, (U8*)md5string);
 }
 
 int swf_VerifyPassword(TAG * t, const char * password)
 {
     char*md5string1, *md5string2;
     char*x;
-    char*md5, *salt;
+    char*salt;
     int n;
 
     if(t->len >= 5 && t->pos==0 && 
@@ -888,18 +863,21 @@ TAG* swf_CopyTag(TAG*tag, TAG*to_copy)
     return tag;
 }
 
-int swf_DeleteTag(TAG * t)
-{ if (!t) return -1;
+TAG* swf_DeleteTag(SWF*swf, TAG * t)
+{
+  TAG*next = t->next;
 
+  if (swf && swf->firstTag==t) 
+    swf->firstTag = t->next;
   if (t->prev) t->prev->next = t->next;
   if (t->next) t->next->prev = t->prev;
 
   if (t->data) rfx_free(t->data);
   rfx_free(t);
-  return 0;
+  return next;
 }
 
-TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
+TAG * swf_ReadTag(reader_t*reader, TAG * prev)
 { TAG * t;
   U16 raw;
   U32 len;
@@ -947,7 +925,7 @@ TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
 
 int swf_DefineSprite_GetRealSize(TAG * t);
 
-int swf_WriteTag2(struct writer_t*writer, TAG * t)
+int swf_WriteTag2(writer_t*writer, TAG * t)
 // returns tag length in bytes (incl. Header), -1 = Error
 // writer = 0 -> no output
 { U16 raw[3];
@@ -958,10 +936,17 @@ int swf_WriteTag2(struct writer_t*writer, TAG * t)
 
   len = (t->id==ST_DEFINESPRITE)?swf_DefineSprite_GetRealSize(t):t->len;
 
-  short_tag = len<0x3f&&(t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2);
+  short_tag = len<0x3f&&
+    (t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2&&t->id!=ST_SOUNDSTREAMBLOCK&&
+     t->id!=ST_DEFINEBITSJPEG&&t->id!=ST_DEFINEBITSJPEG2&&t->id!=ST_DEFINEBITSJPEG3);
 
   if (writer)
-  { if (short_tag)
+  {
+#ifdef MEASURE
+  int oldpos = writer->pos;
+#endif
+    
+    if (short_tag)
     { raw[0] = SWAP16(len|((t->id&0x3ff)<<6));
       if (writer->write(writer,raw,2)!=2)
       {
@@ -1004,6 +989,11 @@ int swf_WriteTag2(struct writer_t*writer, TAG * t)
     #ifdef DEBUG_RFXSWF
       else if (t->len) fprintf(stderr,"WriteTag(): Tag Data Error, id=%i\n",t->id);
     #endif
+
+#ifdef MEASURE
+  writer->flush(writer);
+  printf("TAG %s costs %d bytes\n", swf_TagGetName(t), writer->pos-oldpos);
+#endif
   }
 
   return t->len+(short_tag?2:6);
@@ -1011,7 +1001,7 @@ int swf_WriteTag2(struct writer_t*writer, TAG * t)
 
 int swf_WriteTag(int handle, TAG * t)
 {
-  struct writer_t writer;
+  writer_t writer;
   int len = 0;
   if(handle<0)
     return swf_WriteTag2(0, t);
@@ -1091,7 +1081,7 @@ void swf_UnFoldSprite(TAG * t)
 void swf_FoldSprite(TAG * t)
 {
   TAG*sprtag=t,*tmp;
-  U16 id,frames,tmpid;
+  U16 id,frames;
   int level;
   if(t->id!=ST_DEFINESPRITE)
       return;
@@ -1135,7 +1125,10 @@ void swf_FoldSprite(TAG * t)
 
   do
   { 
-    if(t->len<0x3f&&t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2) {
+    if(t->len<0x3f&&
+	(t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2&&t->id!=ST_SOUNDSTREAMBLOCK&&
+	 t->id!=ST_DEFINEBITSJPEG&&t->id!=ST_DEFINEBITSJPEG2&&t->id!=ST_DEFINEBITSJPEG3)
+      ) {
 	swf_SetU16(sprtag,t->len|(t->id<<6));
     } else {
 	swf_SetU16(sprtag,0x3f|(t->id<<6));
@@ -1149,7 +1142,7 @@ void swf_FoldSprite(TAG * t)
     if(t->id == ST_END)
 	level--;
     t = swf_NextTag(t);
-    swf_DeleteTag(tmp);
+    swf_DeleteTag(0, tmp);
   } 
   while (t && level);
   if(level)
@@ -1229,7 +1222,10 @@ void swf_OptimizeTagOrder(SWF*swf)
 	  tag->next = level0;
 	  tag->prev = level0->prev;
 	  level0->prev = tag;
-	  tag->prev->next = tag;
+          if(tag->prev)
+	    tag->prev->next = tag;
+          else
+            swf->firstTag = tag;
 	  changes = 1;
 	}
       }
@@ -1244,7 +1240,7 @@ void swf_OptimizeTagOrder(SWF*swf)
 
 // Movie Functions
 
-int swf_ReadSWF2(struct reader_t*reader, SWF * swf)   // Reads SWF to memory (malloc'ed), returns length or <0 if fails
+int swf_ReadSWF2(reader_t*reader, SWF * swf)   // Reads SWF to memory (malloc'ed), returns length or <0 if fails
 {     
   if (!swf) return -1;
   memset(swf,0x00,sizeof(SWF));
@@ -1253,7 +1249,7 @@ int swf_ReadSWF2(struct reader_t*reader, SWF * swf)   // Reads SWF to memory (ma
     int len;
     TAG * t;
     TAG t1;
-    struct reader_t zreader;
+    reader_t zreader;
     
     if ((len = reader->read(reader ,b,8))<8) return -1;
 
@@ -1268,6 +1264,7 @@ int swf_ReadSWF2(struct reader_t*reader, SWF * swf)   // Reads SWF to memory (ma
 	reader_init_zlibinflate(&zreader, reader);
 	reader = &zreader;
     }
+    swf->compressed = 0; // derive from version number from now on
 
     reader_GetRect(reader, &swf->movieSize);
     reader->read(reader, &swf->frameRate, 2);
@@ -1277,7 +1274,13 @@ int swf_ReadSWF2(struct reader_t*reader, SWF * swf)   // Reads SWF to memory (ma
 
     /* read tags and connect to list */
     t = &t1;
-    while (t) t = swf_ReadTag(reader,t);
+    while (t) {
+      t = swf_ReadTag(reader,t);
+      if(t && t->id == ST_FILEATTRIBUTES) {
+        swf->fileAttributes = swf_GetU32(t);
+        swf_ResetReadBits(t);
+      }
+    }
     swf->firstTag = t1.next;
     t1.next->prev = NULL;
   }
@@ -1287,37 +1290,89 @@ int swf_ReadSWF2(struct reader_t*reader, SWF * swf)   // Reads SWF to memory (ma
 
 int swf_ReadSWF(int handle, SWF * swf)
 {
-  struct reader_t reader;
+  reader_t reader;
   reader_init_filereader(&reader, handle);
   return swf_ReadSWF2(&reader, swf);
 }
 
-int  swf_WriteSWF2(struct writer_t*writer, SWF * swf)     // Writes SWF to file, returns length or <0 if fails
+int no_extra_tags = 0;
+
+int WriteExtraTags(SWF*swf, writer_t*writer)
+{
+    TAG*t = swf->firstTag;
+    TAG* has_fileattributes=0;
+    int has_scenedescription=0;
+    int has_version_8_action=0;
+    int has_version_9_action=0;
+    int len = 0;
+    while(t) {
+        if(t->id == ST_FILEATTRIBUTES)
+            has_fileattributes = t;
+        if(t->id == ST_SCENEDESCRIPTION)
+            has_scenedescription = 1;
+        if(t->id == ST_DOABC) 
+            has_version_9_action=1;
+        /* FIXME: this doesn't yet find actionscript in buttons */
+        if(t->id == ST_DOACTION || t->id == ST_DOINITACTION) 
+            has_version_8_action=1;
+        if(t->id == ST_PLACEOBJECT2 && t->len && (t->data[0]&0x80))
+            has_version_8_action=1;
+        t = t->next;
+    }
+    if(has_version_8_action && has_version_9_action) {
+        fprintf(stderr, "Warning: File contains both flash 8 and flash 9 actionscript\n");
+    }
+
+    if(swf->fileVersion >= 9) {
+        if(!has_fileattributes) {
+            U32 flags = swf->fileAttributes|0x08; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork
+            if(has_version_8_action && !has_version_9_action)
+                flags &= ~0x08;
+            TAG*fileattrib = swf_InsertTag(0, ST_FILEATTRIBUTES);
+            swf_SetU32(fileattrib, flags);
+            if(writer) {
+                if(swf_WriteTag2(writer, fileattrib)<0) 
+                    return -1;
+            } else {
+                len += swf_WriteTag(-1,fileattrib);
+            }
+            swf_DeleteTag(0, fileattrib);
+        } else {
+            if(swf_WriteTag2(writer, has_fileattributes)<0) 
+                return -1;
+        }
+        if(!has_scenedescription) {
+            TAG*scene = swf_InsertTag(0, ST_SCENEDESCRIPTION);
+            swf_SetU16(scene, 1);
+            swf_SetString(scene, (U8*)"Scene 1");
+            swf_SetU8(scene, 0);
+            if(writer) {
+                if(swf_WriteTag2(writer, scene)<0) 
+                    return -1;
+            } else {
+                len += swf_WriteTag(-1,scene);
+            }
+            swf_DeleteTag(0, scene);
+        }
+    }
+    return len;
+}
+
+int  swf_WriteSWF2(writer_t*writer, SWF * swf)     // Writes SWF to file, returns length or <0 if fails
 { U32 len;
   TAG * t;
   int frameCount=0;
-  struct writer_t zwriter;
+  writer_t zwriter;
   int fileSize = 0;
   int inSprite = 0;
-  int writer_lastpos = 0;
   int ret;
+  writer_t*original_writer = writer;
+  int writer_lastpos = 0;
     
   if (!swf) return -1;
   if (!writer) return -1; // the caller should provide a nullwriter, not 0, for querying SWF size
 
-  if(writer) writer_lastpos = writer->pos;
-
-  // Insert REFLEX Tag
-
-#ifdef INSERT_RFX_TAG
-
-  if (swf->firstTag && swf->firstTag->next &&
-      (swf->firstTag->id != ST_REFLEX || swf->firstTag->next->id != ST_REFLEX)
-     ) {
-      swf_SetBlock(swf_InsertTagBefore(swf, swf->firstTag,ST_REFLEX),"rfx",3);
-  }
-
-#endif // INSERT_RFX_TAG
+  if(original_writer) writer_lastpos = original_writer->pos;
 
   // Count Frames + File Size
 
@@ -1325,6 +1380,7 @@ int  swf_WriteSWF2(struct writer_t*writer, SWF * swf)     // Writes SWF to file,
   t = swf->firstTag;
   frameCount = 0;
 
+  len += WriteExtraTags(swf, 0);
   while(t) {
       len += swf_WriteTag(-1,t);
       if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++;
@@ -1373,11 +1429,10 @@ int  swf_WriteSWF2(struct writer_t*writer, SWF * swf)     // Writes SWF to file,
        It also means that we don't initialize our own zlib
        writer, but assume the caller provided one.
      */
-      if(swf->compressed) {
+      if(swf->compressed==1 || (swf->compressed==0 && swf->fileVersion>=6)) {
 	char*id = "CWS";
 	writer->write(writer, id, 3);
-      }
-      else {
+      } else {
 	char*id = "FWS";
 	writer->write(writer, id, 3);
       }
@@ -1386,7 +1441,7 @@ int  swf_WriteSWF2(struct writer_t*writer, SWF * swf)     // Writes SWF to file,
       PUT32(b4, swf->fileSize);
       writer->write(writer, b4, 4);
       
-      if(swf->compressed) {
+      if(swf->compressed==1 || (swf->compressed==0 && swf->fileVersion>=6)) {
 	writer_init_zlibdeflate(&zwriter, writer);
 	writer = &zwriter;
       }
@@ -1407,15 +1462,22 @@ int  swf_WriteSWF2(struct writer_t*writer, SWF * swf)     // Writes SWF to file,
       return -1;
     }
 
+    if(!no_extra_tags) {
+        WriteExtraTags(swf, writer);
+    }
     t = swf->firstTag;
-    while (t)
-    { if (swf_WriteTag2(writer, t)<0) return -1;
-      t = swf_NextTag(t);
+
+    while (t) { 
+        if(no_extra_tags || t->id != ST_FILEATTRIBUTES) {
+          if(swf_WriteTag2(writer, t)<0) 
+            return -1;
+        }
+        t = t->next;
     }
-    if(swf->compressed) {
+    if(swf->compressed==1 || (swf->compressed==0 && swf->fileVersion>=6) || swf->compressed==8) {
       if(swf->compressed != 8) {
 	zwriter.finish(&zwriter);
-	return writer->pos - writer_lastpos;
+	return original_writer->pos - writer_lastpos;
       }
       return (int)fileSize;
     } else {
@@ -1426,13 +1488,13 @@ int  swf_WriteSWF2(struct writer_t*writer, SWF * swf)     // Writes SWF to file,
 
 int  swf_WriteSWF(int handle, SWF * swf)     // Writes SWF to file, returns length or <0 if fails
 {
-  struct writer_t writer;
+  writer_t writer;
   int len = 0;
-  swf->compressed = 0;
   
   if(handle<0) {
     writer_init_nullwriter(&writer);
     len = swf_WriteSWF2(&writer, swf);
+    return len;
   }
   writer_init_filewriter(&writer, handle);
   len = swf_WriteSWF2(&writer, swf);
@@ -1440,23 +1502,7 @@ int  swf_WriteSWF(int handle, SWF * swf)     // Writes SWF to file, returns leng
   return len;
 }
 
-int  swf_WriteSWC(int handle, SWF * swf)     // Writes SWF to file, returns length or <0 if fails
-{
-  struct writer_t writer;
-  int len = 0;
-  swf->compressed = 1;
-
-  if(handle<0) {
-    writer_init_nullwriter(&writer);
-    len = swf_WriteSWF2(&writer, swf);
-  }
-  writer_init_filewriter(&writer, handle);
-  len = swf_WriteSWF2(&writer, swf);
-  writer.finish(&writer);
-  return len;
-}
-
-int swf_WriteHeader2(struct writer_t*writer,SWF * swf)
+int swf_WriteHeader2(writer_t*writer,SWF * swf)
 {
   SWF myswf;
   memcpy(&myswf,swf,sizeof(SWF));
@@ -1492,11 +1538,12 @@ int swf_WriteCGI(SWF * swf)
 
 SWF* swf_CopySWF(SWF*swf)
 {
-    SWF*nswf = rfx_alloc(sizeof(SWF));
+    SWF*nswf = (SWF*)rfx_alloc(sizeof(SWF));
+    TAG*tag, *ntag;
     memcpy(nswf, swf, sizeof(SWF));
     nswf->firstTag = 0;
-    TAG*tag = swf->firstTag;
-    TAG*ntag = 0;
+    tag = swf->firstTag;
+    ntag = 0;
     while(tag) {
         ntag = swf_CopyTag(ntag, tag);
         if(!nswf->firstTag)
@@ -1520,16 +1567,18 @@ void swf_FreeTags(SWF * swf)                 // Frees all malloc'ed memory for t
 
 // include advanced functions
 
-#include "modules/swfdump.c"
-#include "modules/swfshape.c"
-#include "modules/swftext.c"
-#include "modules/swffont.c"
-#include "modules/swfobject.c"
-#include "modules/swfbutton.c"
-#include "modules/swftools.c"
-#include "modules/swfcgi.c"
-#include "modules/swfbits.c"
-#include "modules/swfaction.c"
-#include "modules/swfsound.c"
-#include "modules/swfdraw.c"
-#include "modules/swfrender.c"
+//#include "modules/swfdump.c"
+//#include "modules/swfshape.c"
+//#include "modules/swftext.c"
+//#include "modules/swffont.c"
+//#include "modules/swfobject.c"
+//#include "modules/swfbutton.c"
+//#include "modules/swftools.c"
+//#include "modules/swfcgi.c"
+//#include "modules/swfbits.c"
+//#include "modules/swfaction.c"
+//#include "modules/swfabc.c"
+//#include "modules/swfsound.c"
+//#include "modules/swfdraw.c"
+//#include "modules/swfrender.c"
+//#include "modules/swffilter.c"