X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Frfxswf.c;h=bd8cd17ac2efee628f3859a5d795494f48b8bdfb;hp=ecc5fd316fe69d21fc98aaab99d1feb6c5ae404e;hb=e0a27e1bd83ff2d60745dd6030e0f5ef7ef97b82;hpb=e742d2207abedb5f1b321b6c17d0d9c8fa31518b diff --git a/lib/rfxswf.c b/lib/rfxswf.c index ecc5fd3..bd8cd17 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 @@ -204,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++; } } @@ -278,79 +283,123 @@ 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; + int nr=0; while(1) { U8 b = swf_GetU8(tag); + nr++; s|=(b&127)<=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_GetS30(TAG*tag) + +int swf_SetU30(TAG*tag, U32 u) { - U32 shift = 0; - U32 s = 0; - int nr=0; - while(1) { - U8 b = swf_GetU8(tag); + int nr = 0; + do { + if(tag) + swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); + u>>=7; nr++; - s|=(b&127)<>=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); } -int swf_SetS30(TAG*tag, S32 s) + +#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?0x80:0; - int nr=0,pos=tag->len; + U8 sign = s<0?0x40:0; while(1) { U8 val = s&0x7f; - U8 vsign = s&0x80; + U8 vsign = s&0x40; s>>=7; neg>>=7; if(s==neg && vsign==sign) { - /* if the value we just wrote has the same sign as s + /* 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 */ - if(tag) - swf_SetU8(tag, val); - nr++; + swf_SetU8(tag, val); + printf("put %02x\n", val); break; } else { - if(tag) - swf_SetU8(tag, 0x80 | val); - nr++; + swf_SetU8(tag, 0x80 | val); + printf("put %02x\n", 0x80|val); } }; - return nr; - } -int swf_SetU30(TAG*tag, U32 u) +int swf_GetS30(TAG*tag) { - int nr = 0; - do { - if(tag) - swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); - u>>=7; + U32 shift = 0; + U32 s = 0; + int nr=0; + while(1) { + U8 b = swf_GetU8(tag); nr++; - } while(u); - return 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<frameCount = SWAP16(swf->frameCount); /* read tags and connect to list */ + t1.next = 0; t = &t1; while (t) { t = swf_ReadTag(reader,t); @@ -1430,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; @@ -1443,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) @@ -1473,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) { @@ -1489,7 +1564,7 @@ int WriteExtraTags(SWF*swf, writer_t*writer) 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"); @@ -1528,7 +1603,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++; @@ -1610,7 +1687,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; @@ -1634,6 +1711,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;