X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Frfxswf.c;h=18b2c569816047eb7c1270d1a63306a702f05537;hp=b6062c5f0b5afae8ee8a8e13ff71d1518b7235c4;hb=fc815311aa1bd67877b404493838dfd85a86f596;hpb=f37b0cbc930fb3d9907044f24471d57c9f68dd43 diff --git a/lib/rfxswf.c b/lib/rfxswf.c index b6062c5..18b2c56 100644 --- a/lib/rfxswf.c +++ b/lib/rfxswf.c @@ -46,6 +46,7 @@ #include "./bitio.h" #include "./MD5.h" +#include "./os.h" // internal constants @@ -94,7 +95,6 @@ U8 swf_GetU8(TAG * t) #ifdef DEBUG_RFXSWF if (t->pos>=t->len) { fprintf(stderr,"GetU8() out of bounds: TagID = %i\n",t->id); - *(int*)0=0; return 0; } #endif @@ -177,7 +177,9 @@ int swf_SetU16(TAG * t,U16 v) 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); } @@ -204,17 +206,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++; } } @@ -278,7 +285,8 @@ void swf_SetFixed8(TAG * t, float f) swf_SetU8(t, fr); swf_SetU8(t, (U8)f - (f<0 && fr!=0)); } -int swf_GetU30(TAG*tag) + +U32 swf_GetU30(TAG*tag) { U32 shift = 0; U32 s = 0; @@ -293,10 +301,72 @@ int swf_GetU30(TAG*tag) } /*int nr2= swf_SetU30(0, s); if(nr!=nr2) { - printf("Signed value %d stored in %d bytes, I'd store it in %d bytes\n", s, 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; @@ -305,11 +375,17 @@ int swf_GetS30(TAG*tag) while(1) { U8 b = swf_GetU8(tag); nr++; - s|=(b&127)<len>10?10:t->len; + for(i=0;idata[i]); + } + fprintf(stderr, "\n"); + s|=(b&127)<=32) { if(b&64) { - s|=0xffffffff<>=7; - neg>>=7; - if(s==neg && vsign==sign) { - /* if the value we just wrote has the same sign as s - and all the remaining bits are equal to the sign of s - too, stop writing */ - if(tag) - swf_SetU8(tag, val); - nr++; - break; - } else { - if(tag) - swf_SetU8(tag, 0x80 | val); - nr++; - } - }; - return nr; +#endif -} -int swf_SetU30(TAG*tag, U32 u) -{ - if(u&0x80000000) { - fprintf(stderr, "Bit 31 set in U30 value"); - u&=0x7fffffff; - } - int nr = 0; - do { - if(tag) - swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); - u>>=7; - nr++; - } while(u); - return nr; -} -int swf_SetU30String(TAG*tag, const char*str) +int swf_SetU30String(TAG*tag, const char*str, int l) { - int l = strlen(str); int len=0; len+=swf_SetU30(tag, l); len+=l; swf_SetBlock(tag, (void*)str, l); return len; } +float swf_GetF16(TAG * t) +{ + // D16 is 1-5-10 + // D32 is 1-8-23 + U16 f1 = swf_GetU16(t); + if(!f1) return 0; + U32 f2 = (f1&0x8000)<<16; //sign + f2 |= ((f1&0x7c00)<<13)+(0x40000000-(0x4000<<13)); //exp + f2 |= (f1&0x03ff)<<13; //mantissa + return *(float*)&f2; +} +void swf_SetF16(TAG * t, float f) +{ + U32 f1 = *(U32*)&f; + U16 f2 = (f1>>16)&0x8000; + int exp = ((f1>>23)&0xff)-0x80+0x10; + if(exp<0) { + exp = 0; + fprintf(stderr, "Exponent underflow in FLOAT16 encoding\n"); + } else if(exp>=32) { + exp = 31; + fprintf(stderr, "Exponent overflow in FLOAT16 encoding\n"); + } + f2 |= exp<<10; + f2 |= (f1>>13)&0x3ff; + swf_SetU16(t, f2); +} + double swf_GetD64(TAG*tag) { /* FIXME: this is not big-endian compatible */ @@ -596,7 +659,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; } @@ -762,7 +827,9 @@ int swf_SetMatrix(TAG * t,MATRIX * m) 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); @@ -776,7 +843,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); @@ -787,7 +856,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); @@ -916,7 +987,7 @@ void swf_SetPassword(TAG * t, const char * password) md5string = crypt_md5(password, salt); swf_SetU16(t,0); - swf_SetString(t, (U8*)md5string); + swf_SetString(t, md5string); } void swf_SetString(TAG*t, const char* s) @@ -924,7 +995,7 @@ void swf_SetString(TAG*t, const char* s) if(!s) { swf_SetU8(t, 0); } else { - swf_SetBlock(t,s,strlen(s)+1); + swf_SetBlock(t,(U8*)s,strlen(s)+1); } } @@ -1071,7 +1142,9 @@ TAG * swf_ReadTag(reader_t*reader, TAG * prev) { 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, "rfxswf: Warning: Short read (tagid %d). File truncated?\n", t->id); + #endif free(t->data);t->data=0; free(t); return NULL; @@ -1250,7 +1323,9 @@ void swf_FoldSprite(TAG * t) 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) { @@ -1437,6 +1512,7 @@ int swf_ReadSWF2(reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed swf->frameCount = SWAP16(swf->frameCount); /* read tags and connect to list */ + t1.next = 0; t = &t1; while (t) { t = swf_ReadTag(reader,t); @@ -1446,12 +1522,26 @@ int swf_ReadSWF2(reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed } } 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) { reader_t reader; @@ -1459,6 +1549,17 @@ int swf_ReadSWF(int handle, SWF * swf) return swf_ReadSWF2(&reader, swf); } +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) @@ -1489,9 +1590,9 @@ int WriteExtraTags(SWF*swf, writer_t*writer) if(swf->fileVersion >= 9) { if(!has_fileattributes) { - U32 flags = swf->fileAttributes|0x08; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork + U32 flags = swf->fileAttributes|FILEATTRIBUTE_AS3; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork if(has_version_8_action && !has_version_9_action) - flags &= ~0x08; + flags &= ~FILEATTRIBUTE_AS3; TAG*fileattrib = swf_InsertTag(0, ST_FILEATTRIBUTES); swf_SetU32(fileattrib, flags); if(writer) { @@ -1502,13 +1603,24 @@ int WriteExtraTags(SWF*swf, writer_t*writer) } swf_DeleteTag(0, fileattrib); } else { - if(swf_WriteTag2(writer, has_fileattributes)<0) - return -1; + 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(!has_scenedescription) { + if(0 && !has_scenedescription) { TAG*scene = swf_InsertTag(0, ST_SCENEDESCRIPTION); swf_SetU16(scene, 1); - swf_SetString(scene, (U8*)"Scene 1"); + swf_SetString(scene, "Scene 1"); swf_SetU8(scene, 0); if(writer) { if(swf_WriteTag2(writer, scene)<0) @@ -1544,7 +1656,9 @@ int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, return t = swf->firstTag; frameCount = 0; - len += WriteExtraTags(swf, 0); + if(swf->firstTag && !no_extra_tags) { + len += WriteExtraTags(swf, 0); + } while(t) { len += swf_WriteTag(-1,t); if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++; @@ -1626,7 +1740,7 @@ int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, return return -1; } - if(!no_extra_tags) { + if(swf->firstTag && !no_extra_tags) { WriteExtraTags(swf, writer); } t = swf->firstTag; @@ -1650,6 +1764,21 @@ int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, return } } +int swf_SaveSWF(SWF * swf, char*filename) +{ + 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_WriteSWF(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails { writer_t writer;