From dc63a658ba745c8e2381765f51e63d765a6064d9 Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Wed, 16 Dec 2009 15:06:58 -0800 Subject: [PATCH] applied swfextract binary resource patch from Paul Fitzpatrick --- src/swfextract.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/src/swfextract.c b/src/swfextract.c index 2d6b357..ee96ad2 100644 --- a/src/swfextract.c +++ b/src/swfextract.c @@ -42,6 +42,7 @@ char* extractjpegids = 0; char* extractfontids = 0; char* extractpngids = 0; char* extractsoundids = 0; +char* extractbinaryids = 0; char extractmp3 = 0; char* extractname = 0; @@ -68,6 +69,7 @@ struct options_t options[] = {"f","frame"}, {"F","font"}, {"V","version"}, + {"b","binary"}, {0,0} }; @@ -137,6 +139,15 @@ int args_callback_option(char*name,char*val) extractsoundids = val; return 1; } + else if(!strcmp(name, "b")) { + if(extractbinaryids) { + fprintf(stderr, "Only one --binary argument is allowed. (Try to use a range, e.g. -s 1,2,3)\n"); + exit(1); + } + numextracts++; + extractbinaryids = val; + return 1; + } #ifdef _ZLIB_INCLUDED_ else if(!strcmp(name, "p")) { if(extractpngids) { @@ -486,6 +497,9 @@ int isOfType(int t, TAG*tag) if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2 || tag->id == ST_DEFINEFONT3)) { show = 1; } + if (t== 6 && (tag->id == ST_DEFINEBINARY)) { + show = 1; + } return show; } @@ -495,8 +509,8 @@ void listObjects(SWF*swf) char first; int t; int frame = 0; - char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font"}; - char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F"}; + char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font", "Binary"}; + char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F","-b"}; int mp3=0; printf("Objects in file %s:\n",filename); swf_FoldAll(swf); @@ -1023,6 +1037,30 @@ void handledefinesound(TAG*tag) fclose(fi); } +void handlebinary(TAG*tag) { + FILE *fout = NULL; + char buf[100]; + char *filename = buf; + int len = tag->memsize; + int dx = 6; // offset to binary data + if (tag->id!=ST_DEFINEBINARY) { + fprintf(stderr, "Object %d is not a binary entity!\n", + GET16(tag->data)); + return; + } + sprintf(buf, "binary%d.bin", GET16(tag->data)); + if(numextracts==1) { + filename = destfilename; + if(!strcmp(filename,"output.swf")) { + sprintf(buf, "output.bin"); + filename = buf; + } + } + fout = fopen(filename, "wb"); + fwrite(tag->data+dx,len-dx,1,fout); + fclose(fout); +} + int main (int argc,char ** argv) { TAG*tag; @@ -1036,7 +1074,7 @@ int main (int argc,char ** argv) processargs(argc, argv); if(!extractframes && !extractids && ! extractname && !extractjpegids && !extractpngids - && !extractmp3 && !extractsoundids && !extractfontids) + && !extractmp3 && !extractsoundids && !extractfontids && !extractbinaryids) listavailable = 1; if(!originalplaceobjects && movetozero) { @@ -1141,6 +1179,9 @@ int main (int argc,char ** argv) if(extractsoundids && is_in_range(id, extractsoundids)) { handledefinesound(tag); } + if(extractbinaryids && is_in_range(id, extractbinaryids)) { + handlebinary(tag); + } #ifdef _ZLIB_INCLUDED_ if(extractpngids && is_in_range(id, extractpngids)) { handlelossless(tag); -- 1.7.10.4