X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=d601a1550849d7fe508943bf6fdfa71c96a7b33c;hb=ebb61a567502ebe4b3d3c4b3284964600fecd90b;hp=57c93a75e9b9113d6c8da1dd6ae66dd1862dcfdf;hpb=4a2cafb58caa55701e588d44fd0ebb674d6a81c6;p=swftools.git diff --git a/lib/rfxswf.c b/lib/rfxswf.c index 57c93a7..d601a15 100644 --- a/lib/rfxswf.c +++ b/lib/rfxswf.c @@ -46,6 +46,7 @@ #include "./bitio.h" #include "./MD5.h" +#include "./os.h" // internal constants @@ -203,17 +204,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++; } } @@ -300,10 +306,6 @@ U32 swf_GetU30(TAG*tag) int swf_SetU30(TAG*tag, U32 u) { - if(u&0x80000000) { - fprintf(stderr, "Error: Bit 31 set in U30 value\n"); - u&=0x7fffffff; - } int nr = 0; do { if(tag) @@ -371,7 +373,12 @@ 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) { @@ -391,9 +398,8 @@ int swf_GetS30(TAG*tag) } #endif -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; @@ -1464,6 +1470,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); @@ -1473,12 +1480,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; @@ -1486,6 +1507,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) @@ -1516,9 +1548,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) { @@ -1529,10 +1561,21 @@ 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"); @@ -1571,7 +1614,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++; @@ -1653,7 +1698,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; @@ -1677,6 +1722,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;