From: kramm Date: Tue, 30 Oct 2001 21:00:09 +0000 (+0000) Subject: resolved conflicts X-Git-Tag: release-0-1-0~46 X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=ab9bec0ecf6470ca338b67dcfe13aed513446947;p=swftools.git resolved conflicts --- diff --git a/lib/modules/swfaction.c b/lib/modules/swfaction.c index 2338a43..368807d 100644 --- a/lib/modules/swfaction.c +++ b/lib/modules/swfaction.c @@ -29,7 +29,7 @@ l: label (string) C: constant pool header (byte) c: constant pool entry (string) s: skip (byte) (number of actions) -m: method (byte) GetUrl2:(0=none, 1=get, 2=post)/GotoFrame2:(1=play) +m: method (byte) swf_GetUrl2:(0=none, 1=get, 2=post)/GotoFrame2:(1=play) b: branch (word) (number of bytes) p (push): type(byte), type=0:string, type=1:double {: define function (name (string), num (word), params (num strings), codesize (word) @@ -39,8 +39,8 @@ r: register (byte) {3,"End", 0x00, ""}, {3,"GotoFrame", 0x81, "f"}, {4,"GotoFrame2", 0x9f, "m"}, // -1 (/Movieclip:3) -{3,"GetUrl", 0x83, "ul"}, -{4,"GetUrl2", 0x9a, "m"}, //-2 +{3,"swf_GetUrl", 0x83, "ul"}, +{4,"swf_GetUrl2", 0x9a, "m"}, //-2 {3,"NextFrame", 0x04, ""}, {3,"PreviousFrame", 0x05, ""}, {3,"Play", 0x06, ""}, @@ -128,7 +128,7 @@ r: register (byte) }; static int definedactions = sizeof(actions)/sizeof(struct Action); -ActionTAG* GetActions(TAG*tag) +ActionTAG* swf_GetActions(TAG*tag) { U8 op = 1; int length; @@ -143,17 +143,17 @@ ActionTAG* GetActions(TAG*tag) action->next->next = 0; action = action->next; - op = GetU8(tag); + op = swf_GetU8(tag); if(op<0x80) length = 0; else - length = GetU16(tag); + length = swf_GetU16(tag); if(length) { int t; data = malloc(length); for(t=0;top); + swf_SetU8(tag, action->op); if(action->op & 128) - SetU16(tag, action->len); + swf_SetU16(tag, action->len); - SetBlock(tag, action->data, action->len); + swf_SetBlock(tag, action->data, action->len); action = action->next; } @@ -227,7 +227,7 @@ int OpAdvance(char c, char*data) } /* TODO: this should be in swfdump.c */ -void DumpActions(ActionTAG*atag, char*prefix) +void swf_DumpActions(ActionTAG*atag, char*prefix) { U8 op; int t; diff --git a/src/swfdump.c b/src/swfdump.c index ca8ee27..d0734f5 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -47,15 +47,15 @@ struct options_t options[] = int args_callback_option(char*name,char*val) { if(!strcmp(name, "V")) { - printf("swfdump - part of %s %s\n", PACKAGE, VERSION); - exit(0); + printf("swfdump - part of %s %s\n", PACKAGE, VERSION); + exit(0); } else if(name[0]=='a') { - action = 1; - return 0; + action = 1; + return 0; } else { - printf("Unknown option: -%s\n", name); + printf("Unknown option: -%s\n", name); } return 0; @@ -74,13 +74,20 @@ void args_callback_usage(char*name) int args_callback_command(char*name,char*val) { if(filename) { - fprintf(stderr, "Only one file allowed. You supplied at least two. (%s and %s)\n", - filename, name); + fprintf(stderr, "Only one file allowed. You supplied at least two. (%s and %s)\n", + filename, name); } filename = name; return 0; } +char* what; +char* testfunc(char*str) +{ + printf("%s: %s\n", what, str); + return 0; +} + int main (int argc,char ** argv) { SWF swf; @@ -97,29 +104,29 @@ int main (int argc,char ** argv) if(!filename) { - fprintf(stderr, "You must supply a filename.\n"); - return 1; + fprintf(stderr, "You must supply a filename.\n"); + return 1; } f = open(filename,O_RDONLY); if (f<0) { - perror("Couldn't open file: "); - exit(1); + perror("Couldn't open file: "); + exit(1); } if FAILED(swf_ReadSWF(f,&swf)) { - fprintf(stderr, "%s is not a valid SWF file or contains errors.\n",filename); + fprintf(stderr, "%s is not a valid SWF file or contains errors.\n",filename); close(f); - exit(1); + exit(1); } #ifdef HAVE_STAT fstat(f, &statbuf); - if(statbuf.st_size != swf.fileSize) - fprintf(stderr, "Error: Real Filesize (%d) doesn't match header Filesize (%d)", - statbuf.st_size, swf.fileSize); + if(statbuf.st_size != swf.FileSize) + fprintf(stderr, "Error: Real Filesize (%d) doesn't match header Filesize (%d)", + statbuf.st_size, swf.FileSize); #endif close(f); @@ -134,52 +141,59 @@ int main (int argc,char ** argv) tag = swf.firstTag; while(tag) { - char*name = swf_TagGetName(tag); - if(!name) { - fprintf(stderr, "Error: Unknown tag:0x%03x\n", tag->id); - tag = tag->next; - continue; - } - printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag)); - - if(swf_isDefiningTag(tag)) { - U16 id = swf_GetDefineID(tag); - printf(" defines id %04x", id); - if(idtab[id]) - fprintf(stderr, "Error: Id %04x is defined more than once.\n", id); - idtab[id] = 1; - } - else if(tag->id == ST_PLACEOBJECT || - tag->id == ST_PLACEOBJECT2) { - printf(" places id %04x at depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag)); - if(swf_TagGetName(tag)) - printf(" name \"%s\"",swf_TagGetName(tag)); - } - else if(tag->id == ST_REMOVEOBJECT) { - printf(" removes id %04x from depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag)); - } - else if(tag->id == ST_REMOVEOBJECT2) { - printf(" removes object from depth %04x", swf_GetDepth(tag)); - } - - printf("\n"); - - if(tag->id == ST_DEFINESPRITE) { - sprintf(prefix, " "); - } - else if(tag->id == ST_END) { - *prefix = 0; - } - else if(tag->id == ST_DOACTION && action) { - char myprefix[128]; - ActionTAG*actions; - sprintf(myprefix, " %s", prefix); - - actions = swf_GetActions(tag); - - swf_DumpActions(actions, myprefix); + char*name = swf_GetTagName(tag); + if(!name) { + fprintf(stderr, "Error: Unknown tag:0x%03x\n", tag->id); + tag = tag->next; + continue; + } + printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_GetTagName(tag)); + + if(swf_isDefiningTag(tag)) { + U16 id = swf_GetDefineID(tag); + printf(" defines id %04x", id); + if(idtab[id]) + fprintf(stderr, "Error: Id %04x is defined more than once.\n", id); + idtab[id] = 1; + } + else if(tag->id == ST_PLACEOBJECT || + tag->id == ST_PLACEOBJECT2) { + printf(" places id %04x at depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag)); + if(swf_TagGetName(tag)) + printf(" name \"%s\"",swf_TagGetName(tag)); } - tag = tag->next; + else if(tag->id == ST_REMOVEOBJECT) { + printf(" removes id %04x from depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag)); + } + else if(tag->id == ST_REMOVEOBJECT2) { + printf(" removes object from depth %04x", swf_GetDepth(tag)); + } + + printf("\n"); + + if(tag->id == ST_DEFINESPRITE) { + sprintf(prefix, " "); + } + else if(tag->id == ST_END) { + *prefix = 0; + } + else if(tag->id == ST_DOACTION && action) { + char myprefix[128]; + ActionTAG*actions; + sprintf(myprefix, " %s", prefix); + + actions = swf_GetActions(tag); + + swf_DumpActions(actions, myprefix); + +/* what = "URL"; + ActionEnumerateURLs(actions, testfunc); + what = "String"; + ActionEnumerateStrings(actions, testfunc); + what = "Target"; + ActionEnumerateTargets(actions, testfunc);*/ + } + tag = tag->next; } swf_FreeTags(&swf);