X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Frfxswf.c;h=278e504ce413322d104786ab2166e101ed795dec;hp=f67d951814037125b3115f3c7e7174b51edfc232;hb=98da96466d3a3d8b56da406f6231b8c524449021;hpb=0288babb81e62bf607d8c2e428b577756b655fed diff --git a/lib/rfxswf.c b/lib/rfxswf.c index f67d951..278e504 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 -#endif // HAVE_JPEGLIB - #ifdef HAVE_ZLIB #include #endif // HAVE_ZLIB @@ -45,8 +40,13 @@ #include #endif +#ifdef HAVE_IO_H +#include +#endif + #include "./bitio.h" #include "./MD5.h" +#include "./os.h" // internal constants @@ -55,7 +55,6 @@ #define MEMSIZE(l) (((l/MALLOC_SIZE)+1)*MALLOC_SIZE) - // inline wrapper functions TAG * swf_NextTag(TAG * t) { return t->next; } @@ -65,36 +64,38 @@ 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; } -// Basic Data Access Functions - -#define swf_ResetReadBits(tag) if (tag->readBit) { tag->pos++; tag->readBit = 0; } -#define swf_ResetWriteBits(tag) if (tag->writeBit) { tag->writeBit = 0; } - -// 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; - #ifdef DEBUG_RFXSWF - else fprintf(stderr,"SetTagPos() out of bounds: TagID = %i\n",t->id); - #endif + else { +#ifdef DEBUG_RFXSWF + fprintf(stderr,"SetTagPos(%d) out of bounds: TagID = %i\n",pos, t->id); +#endif + } } 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) { swf_ResetReadBits(t); #ifdef DEBUG_RFXSWF - if (t->pos>=t->len) + if ((int)t->pos>=(int)t->len) { fprintf(stderr,"GetU8() out of bounds: TagID = %i\n",t->id); + *(int*)0=0; return 0; } #endif @@ -105,7 +106,7 @@ U16 swf_GetU16(TAG * t) { U16 res; swf_ResetReadBits(t); #ifdef DEBUG_RFXSWF - if (t->pos>(t->len-2)) + if ((int)t->pos>((int)t->len-2)) { fprintf(stderr,"GetU16() out of bounds: TagID = %i\n",t->id); return 0; } @@ -119,7 +120,7 @@ U32 swf_GetU32(TAG * t) { U32 res; swf_ResetReadBits(t); #ifdef DEBUG_RFXSWF - if (t->pos>(t->len-4)) + if ((int)t->pos>((int)t->len-4)) { fprintf(stderr,"GetU32() out of bounds: TagID = %i\n",t->id); return 0; } @@ -140,21 +141,13 @@ 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); if (newlen>t->memsize) { U32 newmem = MEMSIZE(newlen); - U8 * newdata = (U8*)((t->data)?realloc(t->data,newmem):malloc(newmem)); - if (!newdata) - { - #ifdef DEBUG_RFXSWF - fprintf(stderr,"Fatal Error: malloc()/realloc() failed (1). (%d bytes)\n", newmem); - *(int*)0=0; - #endif - return 0; - } + U8 * newdata = (U8*)(rfx_realloc(t->data,newmem)); t->memsize = newmem; t->data = newdata; } @@ -182,6 +175,15 @@ int swf_SetU16(TAG * t,U16 v) t->data[t->len++] = a[1]; return 0; } +void swf_SetS16(TAG * t,int v) +{ + if(v>32767 || v<-32768) { + #ifdef DEBUG_RFXSWF + fprintf(stderr, "Warning: S16 overflow: %d\n", v); + #endif + } + swf_SetU16(t, (S16)v); +} int swf_SetU32(TAG * t,U32 v) { U8 a[4]; @@ -205,17 +207,22 @@ U32 swf_GetBits(TAG * t,int nbits) if (!t->readBit) t->readBit = 0x80; while (nbits) { res<<=1; +#ifdef DEBUG_RFXSWF + if (t->pos>=t->len) + { fprintf(stderr,"GetBits() out of bounds: TagID = %i, pos=%d, len=%d\n",t->id, t->pos, t->len); + int i,m=t->len>10?10:t->len; + for(i=-1;idata[i]); + } + fprintf(stderr, "\n"); + return res; + } +#endif if (t->data[t->pos]&t->readBit) res|=1; t->readBit>>=1; nbits--; if (!t->readBit) { if (nbits) t->readBit = 0x80; - #ifdef DEBUG_RFXSWF - if (t->pos>=t->len) - { fprintf(stderr,"GetBits() out of bounds: TagID = %i\n",t->id); - return res; - } - #endif t->pos++; } } @@ -228,10 +235,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<=32) + break; + } + /*int nr2= swf_SetU30(0, s); + if(nr!=nr2) { + printf("Unsigned value %d stored in %d bytes, I'd store it in %d bytes\n", s, nr, nr2); + }*/ + return s; +} + +int swf_SetU30(TAG*tag, U32 u) +{ + int nr = 0; + do { + if(tag) + swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); + u>>=7; + nr++; + } while(u); + return nr; +} + +void swf_SetABCU32(TAG*tag, U32 u) +{ + do { + swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); + u>>=7; + } while(u); +} +U32 swf_GetABCU32(TAG*tag) +{ + return swf_GetU30(tag); +} +void swf_SetABCS32(TAG*tag, S32 v) +{ + swf_SetABCU32(tag, v); +} +S32 swf_GetABCS32(TAG*tag) +{ + return swf_GetABCU32(tag); +} + +#if 0 + +/*The AVM2 spec is just plain wrong, claiming that S32 values are sign +extended. They're not. +This wastes up to 4 bytes for every negative value. */ + +void swf_SetABCS32(TAG*tag, S32 s) +{ + printf("write S32: %d\n", s); + S32 neg = s<0?-1:0; + U8 sign = s<0?0x40:0; + while(1) { + U8 val = s&0x7f; + U8 vsign = s&0x40; + s>>=7; + neg>>=7; + if(s==neg && vsign==sign) { + /* if the value we now write has the same sign as s + and all the remaining bits are equal to the sign of s + too, stop writing */ + swf_SetU8(tag, val); + printf("put %02x\n", val); + break; + } else { + swf_SetU8(tag, 0x80 | val); + printf("put %02x\n", 0x80|val); + } + }; +} +int swf_GetS30(TAG*tag) +{ + U32 shift = 0; + U32 s = 0; + int nr=0; + while(1) { + U8 b = swf_GetU8(tag); + nr++; + nt i,m=t->len>10?10:t->len; + for(i=0;idata[i]); + } + fprintf(stderr, "\n"); + s|=(b&127)<=32) { + if(b&64) { + if(shift<32) + s|=0xffffffff<>10)&0x1f; + U16 m = f1&0x3ff; + /* find highest bit in mantissa */ + int h=0; + while(!(m&0x400)) { + m<<=1; + h++; + } + m&=0x3ff; + e -= h; + e += 0x6f; + + f2.u = (f1&0x8000)<<16; //sign + f2.u |= e<<23; //exponent + f2.u |= m<<13; //mantissa + return *(float*)&f2; +} + +void swf_SetF16(TAG * t, float f) +{ + union { + U32 u; + float f; + } v; + v.f = f; + + U16 result = (v.u>>16)&0x8000; //sign + int exp = ((v.u>>23)&0xff)-0x7f+0x10; + U16 m = (v.u>>13)&0x3ff; + //fprintf(stderr, "%f: %04x sign, %d exp, %04x mantissa\n", f, result, exp, m); + if(exp<-10) { + // underflow (clamp to 0.0) + exp = 0; + m = 0; + } else if(exp<0) { + // partial underflow- strip some bits + m = (m|0x400)>>-exp; + exp = 0; + } else if(exp>=32) { + exp = 31; + m = 0x3ff; + fprintf(stderr, "Exponent overflow in FLOAT16 encoding\n"); + } else { + exp++; + m = (m>>1)|0x200; + } + result |= exp<<10; + result |= m; + swf_SetU16(t, result); +} + +float F16toFloat(U16 x) +{ + TAG t; + t.data = (void*)&x; + t.readBit = 0; + t.pos = 0; + t.len = 2; + return swf_GetF16(&t); +} + +float floatToF16(float f) +{ + U16 u = 0; + TAG t; + t.data = (void*)&u; + t.len = 0; + t.memsize = 2; + t.writeBit = 0; + swf_SetF16(&t, f); + return u; +} + +double swf_GetD64(TAG*tag) +{ + /* FIXME: this is not big-endian compatible */ + double value = *(double*)&tag->data[tag->pos]; + swf_GetU32(tag); + swf_GetU32(tag); + return value; +} +int swf_SetD64(TAG*tag, double v) +{ + /* FIXME: this is not big-endian compatible */ + swf_SetU32(tag, ((U32*)&v)[0]); + swf_SetU32(tag, ((U32*)&v)[1]); + return 8; +} +int swf_GetU24(TAG*tag) +{ + int b1 = swf_GetU8(tag); + int b2 = swf_GetU8(tag); + int b3 = swf_GetU8(tag); + return b3<<16|b2<<8|b1; +} +int swf_GetS24(TAG*tag) +{ + int b1 = swf_GetU8(tag); + int b2 = swf_GetU8(tag); + int b3 = swf_GetU8(tag); + if(b3&0x80) { + return -1-((b3<<16|b2<<8|b1)^0xffffff); + } else { + return b3<<16|b2<<8|b1; + } +} +int swf_SetU24(TAG*tag, U32 v) +{ + if(tag) { + if(v&0xff000000) + fprintf(stderr, "Error: Overflow in swf_SetU24()\n"); + swf_SetU8(tag, v); + swf_SetU8(tag, v>>8); + swf_SetU8(tag, v>>16); + } + return 3; +} +int swf_SetS24(TAG*tag, U32 v) +{ + if(tag) { + if(!(v&0xff000000)) + return swf_SetU24(tag, v); + if((v&0xff000000)!=0xff000000) { + fprintf(stderr, "Error: Overflow in swf_SetS24()\n"); + } + swf_SetU8(tag, v); + swf_SetU8(tag, v>>8); + swf_SetU8(tag, v>>16); + } + return 3; +} + + int swf_SetRGB(TAG * t,RGBA * col) { if (!t) return -1; if (col) @@ -288,7 +589,7 @@ int swf_SetRGBA(TAG * t,RGBA * col) void swf_GetRGBA(TAG * t, RGBA * col) { RGBA dummy; - if(!col); + if(!col) col = &dummy; col->r = swf_GetU8(t); col->g = swf_GetU8(t); @@ -298,25 +599,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;tnum;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=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; + } } } @@ -338,6 +643,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; @@ -385,7 +699,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; @@ -405,7 +719,9 @@ int swf_SetRect(TAG * t,SRECT * r) nbits = swf_CountBits(r->ymin,nbits); nbits = swf_CountBits(r->ymax,nbits); if(nbits>=32) { + #ifdef DEBUG_RFXSWF fprintf(stderr, "rfxswf: Warning: num_bits overflow in swf_SetRect\n"); + #endif nbits=31; } @@ -418,8 +734,30 @@ 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) { + src->xmin = add.x; + src->ymin = add.y; + src->xmax = add.x; + src->ymax = add.y; + if((add.x|add.y) == 0) src->xmax++; //make sure the bbox is not NULL anymore + return; + } if(add.x < src->xmin) src->xmin = add.x; if(add.x > src->xmax) @@ -433,6 +771,8 @@ void swf_ExpandRect2(SRECT*src, SRECT*add) { if((add->xmin | add->ymin | add->xmax | add->ymax)==0) return; + if((src->xmin | src->ymin | src->xmax | src->ymax)==0) + *src = *add; if(add->xmin < src->xmin) src->xmin = add->xmin; if(add->ymin < src->ymin) @@ -442,6 +782,25 @@ void swf_ExpandRect2(SRECT*src, SRECT*add) if(add->ymax > src->ymax) src->ymax = add->ymax; } +void swf_ExpandRect3(SRECT*src, SPOINT center, int radius) +{ + if((src->xmin | src->ymin | src->xmax | src->ymax)==0) { + src->xmin = center.x-radius; + src->ymin = center.y-radius; + src->xmax = center.x+radius; + src->ymax = center.y+radius; + if((center.x|center.y|radius) == 0) src->xmax++; //make sure the bbox is not NULL anymore + return; + } + if(center.x - radius < src->xmin) + src->xmin = center.x - radius; + if(center.x + radius > src->xmax) + src->xmax = center.x + radius; + if(center.y - radius < src->ymin) + src->ymin = center.y - radius; + if(center.y + radius > src->ymax) + src->ymax = center.y + radius; +} SPOINT swf_TurnPoint(SPOINT p, MATRIX* m) { SPOINT r; @@ -453,6 +812,8 @@ SRECT swf_TurnRect(SRECT r, MATRIX* m) { SRECT g; SPOINT p1,p2,p3,p4,pp1,pp2,pp3,pp4; + if(!m) + return r; p1.x = r.xmin;p1.y = r.ymin; p2.x = r.xmax;p2.y = r.ymin; p3.x = r.xmin;p3.y = r.ymax; @@ -525,7 +886,10 @@ 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? */ + #ifdef DEBUG_RFXSWF fprintf(stderr,"rfxswf: Error: matrix values too large\n"); + #endif nbits = 31; } swf_SetBits(t,nbits,5); @@ -539,7 +903,9 @@ int swf_SetMatrix(TAG * t,MATRIX * m) nbits = swf_CountBits(m->r0,0); nbits = swf_CountBits(m->r1,nbits); if(nbits>=32) { + #ifdef DEBUG_RFXSWF fprintf(stderr,"rfxswf: Error: matrix values too large\n"); + #endif nbits = 31; } swf_SetBits(t,nbits,5); @@ -550,7 +916,9 @@ int swf_SetMatrix(TAG * t,MATRIX * m) nbits = swf_CountBits(m->tx,0); nbits = swf_CountBits(m->ty,nbits); if(nbits>=32) { + #ifdef DEBUG_RFXSWF fprintf(stderr,"rfxswf: Error: matrix values too large\n"); + #endif nbits = 31; } swf_SetBits(t,nbits,5); @@ -560,7 +928,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; @@ -674,18 +1042,28 @@ 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); +} + +void swf_SetString(TAG*t, const char* s) +{ + if(!s) { + swf_SetU8(t, 0); + } else { + swf_SetBlock(t,(U8*)s,strlen(s)+1); + } } 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 && @@ -708,12 +1086,12 @@ int swf_VerifyPassword(TAG * t, const char * password) return 0; } n = x-(md5string1+3); - salt = (char*)malloc(n+1); + salt = (char*)rfx_alloc(n+1); memcpy(salt, md5string1+3, n); salt[n] = 0; md5string2 = crypt_md5(password, salt); - free(salt); + rfx_free(salt); if(strcmp(md5string1, md5string2) != 0) return 0; return 1; @@ -724,18 +1102,15 @@ int swf_VerifyPassword(TAG * t, const char * password) TAG * swf_InsertTag(TAG * after,U16 id) { TAG * t; - t = (TAG *)malloc(sizeof(TAG)); - if (t) - { memset(t,0x00,sizeof(TAG)); - t->id = id; - - if (after) - { - t->prev = after; - t->next = after->next; - after->next = t; - if (t->next) t->next->prev = t; - } + t = (TAG *)rfx_calloc(sizeof(TAG)); + t->id = id; + + if (after) + { + t->prev = after; + t->next = after->next; + after->next = t; + if (t->next) t->next->prev = t; } return t; } @@ -743,18 +1118,15 @@ TAG * swf_InsertTag(TAG * after,U16 id) TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id) { TAG * t; - t = (TAG *)malloc(sizeof(TAG)); - if (t) - { memset(t,0x00,sizeof(TAG)); - t->id = id; - - if (before) - { - t->next = before; - t->prev = before->prev; - before->prev = t; - if (t->prev) t->prev->next = t; - } + t = (TAG *)rfx_calloc(sizeof(TAG)); + t->id = id; + + if (before) + { + t->next = before; + t->prev = before->prev; + before->prev = t; + if (t->prev) t->prev->next = t; } if(swf && swf->firstTag == before) { swf->firstTag = t; @@ -764,7 +1136,7 @@ TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id) void swf_ClearTag(TAG * t) { - if (t->data) free(t->data); + if (t->data) rfx_free(t->data); t->data = 0; t->pos = 0; t->len = 0; @@ -779,18 +1151,28 @@ void swf_ResetTag(TAG*tag, U16 id) tag->id = id; } -int swf_DeleteTag(TAG * t) -{ if (!t) return -1; +TAG* swf_CopyTag(TAG*tag, TAG*to_copy) +{ + tag = swf_InsertTag(tag, to_copy->id); + swf_SetBlock(tag, to_copy->data, to_copy->len); + return tag; +} + +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) free(t->data); - free(t); - return 0; + if (t->data) rfx_free(t->data); + rfx_free(t); + 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; @@ -804,39 +1186,28 @@ TAG * swf_ReadTag(struct reader_t*reader, TAG * prev) if (len==0x3f) { - if (reader->read(reader, &len, 4) != 4) return NULL; - len = SWAP32(len); + len = reader_readU32(reader); } if (id==ST_DEFINESPRITE) len = 2*sizeof(U16); // Sprite handling fix: Flatten sprite tree - t = (TAG *)malloc(sizeof(TAG)); - - if (!t) - { - #ifdef DEBUG_RFXSWF - fprintf(stderr,"Fatal Error: malloc()/realloc() failed (2). (%d bytes)\n", sizeof(TAG)); - #endif - return NULL; - } - - memset(t,0x00,sizeof(TAG)); + t = (TAG *)rfx_calloc(sizeof(TAG)); t->len = len; t->id = id; if (t->len) - { t->data = (U8*)malloc(t->len); - if (!t->data) - { + { t->data = (U8*)rfx_alloc(t->len); + t->memsize = t->len; + if (reader->read(reader, t->data, t->len) != t->len) { #ifdef DEBUG_RFXSWF - fprintf(stderr,"Fatal Error: malloc()/realloc() failed (3). (%d bytes)\n", t->len); + fprintf(stderr, "rfxswf: Warning: Short read (tagid %d). File truncated?\n", t->id); #endif + free(t->data);t->data=0; + free(t); return NULL; } - t->memsize = t->len; - if (reader->read(reader, t->data, t->len) != t->len) return NULL; } if (prev) @@ -850,7 +1221,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]; @@ -861,10 +1232,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; + 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) { @@ -885,14 +1263,7 @@ int swf_WriteTag2(struct writer_t*writer, TAG * t) return -1; } - len = SWAP32(len); - if (writer->write(writer,&len,4)!=4) - { - #ifdef DEBUG_RFXSWF - fprintf(stderr,"WriteTag() failed: Long Header (2).\n"); - #endif - return -1; - } + writer_writeU32(writer, len); } if (t->data) @@ -907,6 +1278,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); @@ -914,7 +1290,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); @@ -975,7 +1351,7 @@ void swf_UnFoldSprite(TAG * t) it->len = len; it->id = id; if (it->len) - { it->data = (U8*)malloc(it->len); + { it->data = (U8*)rfx_alloc(it->len); it->memsize = it->len; swf_GetBlock(t, it->data, it->len); } @@ -984,7 +1360,7 @@ void swf_UnFoldSprite(TAG * t) break; } - free(t->data); t->data = 0; + rfx_free(t->data); t->data = 0; t->memsize = t->len = t->pos = 0; swf_SetU16(t, spriteid); @@ -994,12 +1370,14 @@ 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; if(!t->len) { + #ifdef DEBUG_RFXSWF fprintf(stderr, "Error: Sprite has no ID!"); + #endif return; } if(t->len>4) { @@ -1009,7 +1387,7 @@ void swf_FoldSprite(TAG * t) t->pos = 0; id = swf_GetU16(t); - free(t->data); + rfx_free(t->data); t->len = t->pos = t->memsize = 0; t->data = 0; @@ -1038,7 +1416,10 @@ void swf_FoldSprite(TAG * t) do { - if(t->len<0x3f) { + 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)); @@ -1052,7 +1433,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) @@ -1132,7 +1513,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; } } @@ -1147,7 +1531,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)); @@ -1156,7 +1540,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; @@ -1171,6 +1555,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); @@ -1179,45 +1564,143 @@ int swf_ReadSWF2(struct reader_t*reader, SWF * swf) // Reads SWF to memory (ma swf->frameCount = SWAP16(swf->frameCount); /* read tags and connect to list */ + t1.next = 0; 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; + if(t1.next) + t1.next->prev = NULL; } return reader->pos; } +SWF* swf_OpenSWF(char*filename) +{ + int fi = open(filename, O_RDONLY|O_BINARY); + if(fi<0) { + fprintf(stderr, "Failed to open %s\n", filename); + return 0; + } + SWF* swf = rfx_alloc(sizeof(SWF)); + swf_ReadSWF(fi, swf); + close(fi); + return swf; +} + 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 +void swf_ReadABCfile(char*filename, SWF*swf) +{ + memset(swf, 0, sizeof(SWF)); + swf->fileVersion=9; + swf->fileAttributes=FILEATTRIBUTE_AS3; //as3 + TAG*tag = swf->firstTag = swf_InsertTag(0, ST_RAWABC); + memfile_t*file = memfile_open(filename); + swf_SetBlock(tag, file->data, file->len); + memfile_close(file); +} + +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|FILEATTRIBUTE_AS3; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork + if(has_version_8_action && !has_version_9_action) + flags &= ~FILEATTRIBUTE_AS3; + 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->fileAttributes) { + /* if we're writing a file out again where we might have possible + modified the fileattributes in the header, adjust the tag data */ + TAG*tt = swf_CopyTag(0,has_fileattributes); + U32 flags = swf_GetU32(tt) | swf->fileAttributes; + swf_ResetTag(tt, tt->id); + swf_SetU32(tt, flags); + if(swf_WriteTag2(writer, has_fileattributes)<0) return -1; + swf_DeleteTag(0, tt); + } else { + if(swf_WriteTag2(writer, has_fileattributes)<0) + return -1; + } + } + if(0 && !has_scenedescription) { + TAG*scene = swf_InsertTag(0, ST_SCENEDESCRIPTION); + swf_SetU16(scene, 1); + swf_SetString(scene, "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 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_NextTag(swf->firstTag)) - if (swf_GetTagID(swf_NextTag(swf->firstTag))!=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 @@ -1225,10 +1708,17 @@ int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file, t = swf->firstTag; frameCount = 0; + if(swf->firstTag && !no_extra_tags) { + len += WriteExtraTags(swf, 0); + } while(t) { len += swf_WriteTag(-1,t); - if(t->id == ST_DEFINESPRITE) inSprite++; + if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++; else if(t->id == ST_END && inSprite) inSprite--; + else if(t->id == ST_END && !inSprite) { + if(t->prev && t->prev->id!=ST_SHOWFRAME) + frameCount++; + } else if(t->id == ST_SHOWFRAME && !inSprite) frameCount++; t = swf_NextTag(t); } @@ -1269,11 +1759,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); } @@ -1282,7 +1771,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; } @@ -1292,7 +1781,7 @@ int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file, swf_SetU16(&t1,swf->frameRate); swf_SetU16(&t1,swf->frameCount); - int ret = writer->write(writer,b,swf_GetTagLen(&t1)); + ret = writer->write(writer,b,swf_GetTagLen(&t1)); if (ret!=swf_GetTagLen(&t1)) { #ifdef DEBUG_RFXSWF @@ -1303,15 +1792,22 @@ int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file, return -1; } + if(swf->firstTag && !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 { @@ -1320,31 +1816,30 @@ 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 +int swf_SaveSWF(SWF * swf, char*filename) { - struct writer_t writer; - int len = 0; - swf->compressed = 0; - - 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 fi = open(filename, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777); + if(fi<0) { + perror(filename); + return 0; + } + if(swf_WriteSWF(fi, swf)<0) { + fprintf(stderr, "Unable to write output file: %s\n", filename); + return 0; + } + close(fi); + return 1; } -int swf_WriteSWC(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails +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 = 1; - + if(handle<0) { writer_init_nullwriter(&writer); len = swf_WriteSWF2(&writer, swf); + return len; } writer_init_filewriter(&writer, handle); len = swf_WriteSWF2(&writer, swf); @@ -1352,7 +1847,7 @@ int swf_WriteSWC(int handle, SWF * swf) // Writes SWF to file, returns leng 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)); @@ -1378,7 +1873,7 @@ int swf_WriteCGI(SWF * swf) sprintf(s,"Content-type: application/x-shockwave-flash\n" "Accept-Ranges: bytes\n" - "Content-Length: %lu\n" + "Content-Length: %d\n" "Expires: Thu, 13 Apr 2000 23:59:59 GMT\n" "\n",len); @@ -1386,28 +1881,49 @@ int swf_WriteCGI(SWF * swf) return swf_WriteSWF(fileno(stdout),swf); } +SWF* swf_CopySWF(SWF*swf) +{ + SWF*nswf = (SWF*)rfx_alloc(sizeof(SWF)); + TAG*tag, *ntag; + memcpy(nswf, swf, sizeof(SWF)); + nswf->firstTag = 0; + tag = swf->firstTag; + ntag = 0; + while(tag) { + ntag = swf_CopyTag(ntag, tag); + if(!nswf->firstTag) + nswf->firstTag = ntag; + tag = tag->next; + } + return nswf; +} + void swf_FreeTags(SWF * swf) // Frees all malloc'ed memory for tags { TAG * t = swf->firstTag; while (t) { TAG * tnew = t->next; - if (t->data) free(t->data); - free(t); + if (t->data) rfx_free(t->data); + rfx_free(t); t = tnew; } + swf->firstTag = 0; } // 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/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"