X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfabc.c;h=7e42951bea4daa5ea546b9d7c70800e542c5eea2;hb=d597c1a412999e1fc4f6d02028d2887e20fe6544;hp=d945bb33c4840ea13d1ce65ebfb93440d5579a9b;hpb=2ca9fe661a4260ee254edbf54f9591d09801de43;p=swftools.git diff --git a/lib/modules/swfabc.c b/lib/modules/swfabc.c index d945bb3..7e42951 100644 --- a/lib/modules/swfabc.c +++ b/lib/modules/swfabc.c @@ -5,7 +5,6 @@ Extension module for the rfxswf library. Part of the swftools package. - Copyright (c) 2007 Alessandro Molina Copyright (c) 2007,2008 Matthias Kramm This program is free software; you can redistribute it and/or modify @@ -25,382 +24,6 @@ #include #include "../rfxswf.h" -static unsigned AVM2_uint32toU30(unsigned val, char * out) -{ - unsigned len = 0; - - while(val) { - out[len++] = (val&~0x7f?0x80:0) | (val & 0x7F); - val >>= 7; - } - - return len; -} - -void AVM2_InsertStops(SWF*swf) -{ - TAG * t; - - //MAIN AS3 CLASS INIT - unsigned frame_nums = 0; - - /* Count number of pages to set up stop callback for every frame */ - t = swf->firstTag; - while(t) { - if (t->id == ST_SHOWFRAME) ++frame_nums; - t = t->next; - } - - TAG * classCall = swf_InsertTagBefore(swf, swf->firstTag, ST_SYMBOLCLASS); - swf_SetU16(classCall, 1); // number of symbols - swf_SetU16(classCall, 0); // object id - swf_SetString(classCall, "stop_fla:MainTimeline"); // class to associate with the symbol - - //0x52 is the Flash9 equivalent to DoAction - char init_pool[322] = { - 0x01,0x00,0x00,0x00, /* Flag Parameter to ST_DOABC (1 = lazy load)*/ - 0x00, /* 0 terminated class name */ - 0x10,0x00,0x2e,0x00, /* ABC file magic number (minor version, major version) */ - 0x00, /* zero integers */ - 0x00, /* zero unsigned integers */ - 0x00, /* zero doubles */ - - 0x11, /* 16 strings (+1) */ - 0x08, 's','t','o','p','_','f','l','a', - 0x0c, 'M','a','i','n','T','i','m','e','l','i','n','e', - 0x0d, 'f','l','a','s','h','.','d','i','s','p','l','a','y', - 0x09, 'M','o','v','i','e','C','l','i','p', - 0x15, 's','t','o','p','_','f','l','a',':','M','a','i','n','T','i','m','e','l','i','n','e', - 0x06, 'd','o','s','t','o','p', - 0x00, // Empty string: ref. to the global namespace - 0x04, 's','t','o','p', - 0x0e, 'a','d','d','F','r','a','m','e','S','c','r','i','p','t', - 0x06, 'O','b','j','e','c','t', - 0x0c, 'f','l','a','s','h','.','e','v','e','n','t','s', - 0x0f, 'E','v','e','n','t','D','i','s','p','a','t','c','h','e','r', - 0x0d, 'D','i','s','p','l','a','y','O','b','j','e','c','t', - 0x11, 'I','n','t','e','r','a','c','t','i','v','e','O','b','j','e','c','t', - 0x16, 'D','i','s','p','l','a','y','O','b','j','e','c','t','C','o','n','t','a','i','n','e','r', - 0x06, 'S','p','r','i','t','e', - - 0x07, /* 6 namespaces (+1) */ - 0x16,0x01, /* kind: CONSTANT_PackageNamespace, ref. to: stop_fla */ - 0x16,0x03, /* kind: CONSTANT_PackageNamespace, ref. to: flash.display */ - 0x18,0x05, /* kind: CONSTANT_ProtectedNamespace, ref. to: stop_fla:MainTimeline */ - 0x17,0x01, /* kind: CONSTANT_PackageInternalNs, ref. to: MainTimeline */ - 0x16,0x07, /* kind: CONSTANT_PackageNamespace, ref. to the global namespace */ - 0x16,0x0b, /* kind: CONSTANT_PackageNamespace, ref. to: flash.events */ - - 0x00, /* zero namespace sets */ - - 0x0c, /* 11 MultiNames (+1) */ - /* 1st value: Multiname kind (0x07 = Qualified Name, a multiname with 1 namespace, refers to a method) - 2nd value: refers to namespace name index in the namespace table - 3rd value: refers to method name index in the string table */ - 0x07,0x01,0x02, /* stop_fla:MainTimeLine */ - 0x07,0x02,0x04, /* flash.display:MovieClip */ - 0x07,0x04,0x06, /* <4th namespace>:dostop */ - 0x07,0x05,0x08, /* :stop */ - 0x07,0x05,0x09, /* :addFrameScript */ - 0x07,0x05,0x0a, /* :Object */ - 0x07,0x06,0x0c, /* flash.events:EventDispatcher */ - 0x07,0x02,0x0d, /* flash.display:DisplayObject */ - 0x07,0x02,0x0e, /* flash.display:InteractiveObject */ - 0x07,0x02,0x0f, /* flash.display:DisplayObjectContainer */ - 0x07,0x02,0x10, /* flash.display:Sprite */ - - 0x04, /* 4 Methods */ - /* METHOD 1 */ - 0x00,0x00,0x00,0x00, /* No params (nor params types), no return type, no method name, flags */ - 0x00,0x00,0x00,0x00, /* No params (nor params types), no return type, no method name, flags */ - 0x00,0x00,0x00,0x00, /* No params (nor params types), no return type, no method name, flags */ - 0x00,0x00,0x00,0x00, /* No params (nor params types), no return type, no method name, flags */ - - 0x00, /* Zero Metadata */ - - 0x01, /* 1 Class */ - 0x01, /* Name: ref. to multiname no. 1 (MainTimeline) */ - 0x02, /* Super_name (base class): ref. to multiname no. 2 (flash.display) */ - 0x08, /* Flags: 0x08 value indicates that it uses its protected namespace (and make next field exists) */ - 0x03, /* Ref. to namespace no. 3 (MainTimeline, protected namespace for this class) */ - 0x00, /* No. of interfaces: there are no interfaces (nor interface definition) */ - 0x02, /* Initializer index: ref. to method no. 2 */ - 0x01, /* No. of traits */ - /* Trait section */ - 0x03, /* Name: ref. to multiname no. 3 (stop) */ - 0x01, /* 0000: no attributes (nor metadata in the next subsection); - then 1: type is Trait_Method */ - /* Trait_method section */ - 0x00, /* NO optimization for virtual calls */ - 0x01, /* Ref. to method no. 1 */ - /* HERE FOLLOW THE CLASS DATA */ - 0x00, /* Ref. to method no. 0 as static initializer for this class */ - 0x00, /* No. of traits for this class (no ones) */ - - 0x01, /* 1 Script */ - 0x03, /* Ref. to method no. 3, invoked prior to any other code in the script */ - 0x01, /* No. of traits */ - /* Trait section */ - 0x01, /* Name: ref. to multiname no. 1 (flash.display:MovieClip) */ - 0x04, /* 0000: no attributes (nor metadata in the next subsection); - then 4: type is Trait_Class*/ - /* Trait_class section */ - 0x01, /* Slot ID where the trait resides */ - 0x00, /* Class index (there is only one class)*/ - - 0x04, /* Method body count: there are 4 method bodies */ - /* HERE FOLLOW THE METHOD BODY DATA */ - 0x00, /* Method index, ref. to method no. 0 */ - 0x01, /* Max stack slots the method can use */ - 0x01, /* No. of registers +1 the method can use: this one cannot use registers */ - 0x09,0x0a, /* Min and max scope depth the method can access*/ - 0x03, /* Code length (in bytes) */ - /* The actual method code: - this is the function stop_fla::MainTimeline$cinit()*/ - 0xd0,0x30,0x47, - 0x00, /* No. of exceptions (no exceptions) */ - 0x00, /* No. of traits (no traits) */ - - 0x01, /* Method index, ref. to method no. 1 */ - 0x01, /* Max stack slots the method can use */ - 0x01, /* No. of registers +1 the method can use: this one cannot use registers */ - 0x0a,0x0b, /* Min and max scope depth the method can access*/ - 0x08, /* Code length (in bytes) */ - /* The actual method code: - this is the function stop_fla::dostop(), - the one that actually executes the stop() */ - 0xd0,0x30,0x5d,0x04,0x4f,0x04,0x00,0x47, - 0x00, /* No. of exceptions (no exceptions) */ - 0x00, /* No. of traits (no traits) */ - }; - - /* Header of stop_fla::MainTimeline() method */ - char constructor_header[5] = { - 0x02, /* Method index, ref. to method no. 2 */ - 0x03, /* Max stack slots the method can use */ - 0x01, /* No. of registers +1 the method can use: this one cannot use registers */ - 0x0a,0x0b /* Min and max scope depth the method can access*/ - }; - - char constructor_first[5] = { - /* The actual method code: - This is the function stop_fla::MainTimeline() - Does: calls the super constructor for class #0 (MainTimeline), - then puts on the stack the object, namespace and name of the arguments - needed by the addFrameScripts, then calls the addFrameScripts - */ - 0xd0, /* getlocal0 */ - 0x30, /* pushscope */ - 0xd0, /* getlocal0 */ - 0x49, /* constructsuper */ - 0x00 /* 0 */ - }; - - char constructor_frame_register[10] = { - 0x5d, /* findpropstrict */ - 0x05, /* 'addFrameScript' */ - 0x25, /* pushshort */ - 0x00, /* frame number for pushshort */ - 0x02, /* NOP (hack to write u30 value of frame number when > 127) */ - 0x60, /* getlex */ - 0x03, /* 'stop_fla::dostop' */ - 0x4f, /* callpropvoid */ - 0x05, /* 'addFrameScript' */ - 0x02 /* 2*/ - }; - - char constructor_return[3] = { - 0x47, /* returnvoid */ - 0x00, /* No. of exceptions (no exceptions) */ - 0x00, /* No. of traits (no traits) */ - }; - - char script_init_pool[47] = { - 0x03, /* Method index, ref. to method no. 3 */ - 0x02, /* Max stack slots the method can use */ - 0x01, /* No. of registers +1 the method can use: this one cannot use registers */ - 0x01,0x09, /* Min and max scope depth the method can access*/ - 0x27, /* Code length (in bytes) */ - /* The actual method code: - this is the function script0$init() */ - 0xd0,0x30,0x65,0x00,0x60,0x06,0x30,0x60,0x07,0x30,0x60,0x08,0x30,0x60,0x09,0x30,0x60,0x0a,0x30,0x60, - 0x0b,0x30,0x60,0x02,0x30,0x60,0x02,0x58,0x00,0x1d,0x1d,0x1d,0x1d,0x1d,0x1d,0x1d,0x68,0x01,0x47, - 0x00, /* No. of exceptions (no exceptions) */ - 0x00 /* No. of traits (no traits) */ - }; - /* END OF THE ABCFILE (Actionscript Byte Code) */ - - char code_len[5] = {0, }; - unsigned clen_len = AVM2_uint32toU30((6 + sizeof(constructor_frame_register) * frame_nums), code_len); - unsigned i, offset = 0; - - TAG *classInit = swf_InsertTagBefore(swf, swf->firstTag, ST_DOABC); - - /* Copy the environment Initialization code */ - swf_SetBlock(classInit, (U8*)init_pool,sizeof(init_pool)); - /* Copy Constructor Method header */ - swf_SetBlock(classInit, (U8*)constructor_header, sizeof(constructor_header)); - /* Add Code block size (u30) to the method header */ - swf_SetBlock(classInit, (U8*)code_len, clen_len); - - /* Copy Constructor Method body first part */ - swf_SetBlock(classInit, (U8*)constructor_first, sizeof(constructor_first)); - - /* Register the callback for every frame */ - for (i = 0; i < frame_nums; ++i) { - AVM2_uint32toU30(i,constructor_frame_register + 3); // Write current frame number - swf_SetBlock(classInit, (U8*)constructor_frame_register, sizeof(constructor_frame_register)); - } - - /* Copy Constructor method body ending, just a return */ - swf_SetBlock(classInit, (U8*)constructor_return, sizeof(constructor_return)); - - /* Copy the script init code */ - swf_SetBlock(classInit, (U8*)script_init_pool, sizeof(script_init_pool)); -} - -void AVM2_InsertButtonLink(SWF*swf) -{ - unsigned char displayEventCode[] = { - // button.dispatchEvent(new Event("pdflinkdown"),true,true) - - 0x01, 0x00, 0x00, 0x00, //flags - 0x00, - 0x10, 0x00, 0x2e, 0x00, //version - 0x00, //no ints - 0x00, //no uints - 0x00, //no floats - 0x14, //19 strings - 0x17, 'e','v','e','n','t','_','o','h','n','e','_','l','i','s','t','e','n','e','r','_','f','l','a', - 0x0c, 'M','a','i','n','t','i','m','e','l','i','n','e', - 0x0d, 'f','l','a','s','h','.','d','i','s','p','l','a','y', - 0x09, 'M','o','v','i','e','c','l','i','p', - 0x24, 'e','v','e','n','t','_','o','h','n','e','_','l','i','s','t','e','n','e','r','_','f','l','a',':','M','a','i','n','t','i','m','e','l','i','n','e', - 0x00, - 0x06, 'b','u','t','t','o','n', - 0x06, 'f','r','a','m','e','1', - 0x0c, 'f','l','a','s','h','.','e','v','e','n','t','s', - 0x05, 'E','v','e','n','t', - 0x0b, 'p','d','f','l','i','n','k','d','o','w','n', - 0x0d, 'd','i','s','p','a','t','c','h','E','v','e','n','t', - 0x0e, 'a','d','d','F','r','a','m','e','S','c','r','i','p','t', - 0x06, 'O','b','j','e','c','t', - 0x0f, 'E','v','e','n','t','d','i','s','p','a','t','c','h','e','r', - 0x0d, 'D','i','s','p','l','a','y','O','b','j','e','c','t', - 0x11, 'I','n','t','e','r','a','c','t','i','v','e','O','b','j','e','c','t', - 0x16, 'D','i','s','p','l','a','y','O','b','j','e','c','t','C','o','n','t','a','i','n','e','r', - 0x06, 'S','p','r','i','t','e', - - 0x07, // 6 namespaces - 0x16, 0x01, - 0x16, 0x03, - 0x18, 0x05, - 0x16, 0x06, - 0x17, 0x01, - 0x16, 0x09, - - 0x00, //zero namespace sets - - 0x0e, //13 multinames - 0x07, 0x01, 0x02, - 0x07, 0x02, 0x04, - 0x07, 0x04, 0x07, - 0x07, 0x05, 0x08, - 0x07, 0x06, 0x0a, - 0x07, 0x04, 0x0c, - 0x07, 0x04, 0x0d, - 0x07, 0x04, 0x0e, - 0x07, 0x06, 0x0f, - 0x07, 0x02, 0x10, - 0x07, 0x02, 0x11, - 0x07, 0x02, 0x12, - 0x07, 0x02, 0x13, - - 0x04, // 4 methods - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - - 0x00, // zero metadata - - 0x01, // 1 class - 0x01, 0x02, 0x08, 0x03, 0x00, 0x02, - 0x02, // 2 traits - 0x03, 0x00, // name, slot - 0x00, 0x02, 0x00, - 0x04, 0x01, // name, method, - 0x00, 0x01, - 0x00, // ref to method 0 (initializer) - 0x00, // no traits - - 0x01, // 1 script - 0x03, 0x01, 0x01, 0x04, 0x01, 0x00, - - 0x04, // 4 method bodies - // method 1 - 0x00, 0x01, 0x01, 0x09, 0x0a, - 0x03, 0xd0, 0x30, 0x47, // code - 0x00, 0x00, - // method 2 - 0x01, 0x05, 0x01, 0x0a, 0x0b, - 0x11, 0xd0, 0x30, 0x60, 0x03, 0x5d, 0x05, 0x2c, 0x0b, 0x26, 0x26, 0x4a, 0x05, 0x03, 0x4f, 0x06, 0x01, 0x47, // code - 0x00, 0x00, - // method 3 - 0x02, 0x03, 0x01, 0x0a, 0x0b, - 0x0f, 0xd0, 0x30, 0xd0, 0x49, 0x00, 0x5d, 0x07, 0x24, 0x00, 0x60, 0x04, 0x4f, 0x07, 0x02, 0x47, // code - 0x00, 0x00, - // method 4 - 0x03, 0x02, 0x01, 0x01, 0x09, - 0x27, 0xd0, 0x30, 0x65, 0x00, 0x60, 0x08, 0x30, 0x60, 0x09, 0x30, 0x60, 0x0a, 0x30, 0x60, 0x0b, //code - 0x30, 0x60, 0x0c, 0x30, 0x60, 0x0d, 0x30, 0x60, 0x02, 0x30, 0x60, 0x02, 0x58, 0x00, 0x1d, 0x1d, - 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x68, 0x01, 0x47, - 0x00, 0x00, - }; -} - -int swf_GetU30(TAG*tag) -{ - U32 shift = 0; - U32 s = 0; - while(1) { - U8 b = swf_GetU8(tag); - s|=(b&127)<d) + free(dict->d);dict->d = 0; + free(dict); +} + const char*dict_getstr(dict_t*dict, int nr) { if(nr > dict->num || nr<0) { printf("error: reference to string %d in dict\n"); @@ -493,61 +204,46 @@ int dict_append_if_new(dict_t*dict, char*name, void*data) { return dict_append(dict, name, data); } -typedef struct _abc_file_t { - - // contant_pool - - dict_t*ints; - dict_t*uints; - dict_t*floats; - dict_t*strings; - dict_t*namespaces; - dict_t*namespace_sets; - dict_t*sets; - dict_t*multinames; - - // abc_file - - dict_t*methods; - dict_t*classes; - dict_t*scripts; - dict_t*method_bodies; -} abc_file_t; +int swf_GetU30(TAG*tag) +{ + U32 shift = 0; + U32 s = 0; + while(1) { + U8 b = swf_GetU8(tag); + s|=(b&127)<data[tag->pos]; + swf_GetU32(tag); + swf_GetU32(tag); + return value; +} -typedef struct _abc_code { - int index; - abc_file_t*abc; - //abc_class_t*cls; - abc_method_t*method; - TAG*tag; - int max_stack; - int local_count; - int init_scope_depth; - int max_scope_depth; - int exception_count; - dict_t*traits; -} abc_code_t; typedef struct _opcode { @@ -729,6 +425,17 @@ int swf_GetU24(TAG*tag) int b3 = swf_GetU8(tag); return b3<<16|b2<<8|b1; } +int swf_GetS24(TAG*tag) +{ + int b1 = swf_GetU8(tag); + int b2 = swf_GetU8(tag); + int b3 = swf_GetU8(tag); + if(b3&0x80) { + return -1-((b3<<16|b2<<8|b1)^0xffffff); + } else { + return b3<<16|b2<<8|b1; + } +} static int parse_code(TAG*tag, int len, abc_file_t*pool, char*prefix) { int end=tag->pos+len; @@ -755,7 +462,8 @@ static int parse_code(TAG*tag, int len, abc_file_t*pool, char*prefix) printf("[method%d]", n); } else if(*p == 'c') { int n = swf_GetU30(tag); - printf("[classinfo%d]", n); + abc_class_t*cls = (abc_class_t*)dict_getdata(pool->classes, n); + printf("[classinfo%d %s]", n, cls->name); } else if(*p == 'i') { int n = swf_GetU30(tag); printf("[methodbody%d]", n); @@ -766,7 +474,7 @@ static int parse_code(TAG*tag, int len, abc_file_t*pool, char*prefix) int b = swf_GetU8(tag); printf("%02x", b); } else if(*p == 'j') { - printf("%d", swf_GetU24(tag)); + printf("%d", swf_GetS24(tag)); } else if(*p == 's') { const char*s = dict_getstr(pool->strings, swf_GetU30(tag)); printf("\"%s\"", s); @@ -800,6 +508,8 @@ static int parse_code(TAG*tag, int len, abc_file_t*pool, char*prefix) return 1; } +static void dump_traits(const char*prefix, dict_t*traits, abc_file_t*pool); + static void dump_method(const char*prefix, const char*type, const char*name, int nr, abc_file_t*pool) { if(nr >= pool->methods->num) { @@ -807,15 +517,22 @@ static void dump_method(const char*prefix, const char*type, const char*name, int return; } abc_method_t*m = (abc_method_t*)dict_getdata(pool->methods, nr); - printf("%s%s %s %s%s\n", prefix, type, dict_getstr(pool->multinames,m->return_type_index), name, m->paramstr); - abc_code_t*c = (abc_code_t*)dict_getdata(pool->method_bodies, m->method_body_index); + const char*return_type = "void"; + if(m->return_type_index) + return_type = dict_getstr(pool->multinames,m->return_type_index); + + printf("%s%s %s %s%s\n", prefix, type, return_type, name, m->paramstr); + + abc_method_body_t*c = (abc_method_body_t*)dict_getdata(pool->method_bodies, m->method_body_index); printf("%s[%d %d %d %d %d]\n", prefix, c->max_stack, c->local_count, c->init_scope_depth, c->max_scope_depth, c->exception_count); swf_SetTagPos(c->tag, 0); char prefix2[80]; sprintf(prefix2, "%s ", prefix); + if(c->traits) + dump_traits(prefix, c->traits, pool); printf("%s{\n", prefix); parse_code(c->tag, c->tag->len, pool,prefix2); printf("%s}\n", prefix); @@ -848,7 +565,9 @@ static void parse_metadata(TAG*tag, abc_file_t*pool) #define TRAIT_SETTER 3 #define TRAIT_CLASS 4 #define TRAIT_FUNCTION 5 -static dict_t* parse_traits(char*prefix, TAG*tag, abc_file_t*pool, char print) +#define TRAIT_CONST 6 + +static dict_t* traits_parse(TAG*tag, abc_file_t*pool) { int num_traits = swf_GetU30(tag); dict_t*traits = dict_new(); @@ -856,37 +575,36 @@ static dict_t* parse_traits(char*prefix, TAG*tag, abc_file_t*pool, char print) if(num_traits) { DEBUG printf("%d traits\n", num_traits); } + for(t=0;tmultinames, name_index); - U8 kind = swf_GetU8(tag); + trait->name_index = swf_GetU30(tag); + const char*name = dict_getstr(pool->multinames, trait->name_index); + U8 kind = trait->type = swf_GetU8(tag); U8 attributes = kind&0xf0; kind&=0x0f; DEBUG printf(" trait %d) %s type=%02x\n", t, name, kind); if(kind == 1 || kind == 2 || kind == 3) { // method / getter / setter - int disp_id = swf_GetU30(tag); - int nr = swf_GetU30(tag); - DEBUG printf(" %smethod %d %d %s\n", prefix, nr, disp_id, ((abc_method_t*)dict_getdata(pool->methods, nr))->paramstr); - if(print) dump_method(prefix, kind==1?"method":(kind==2?"getter":"setter"), name, nr, pool); + trait->disp_id = swf_GetU30(tag); + trait->nr = swf_GetU30(tag); + DEBUG printf(" method/getter/setter\n"); } else if(kind == 5) { // function - int slot_id = swf_GetU30(tag); - int nr = swf_GetU30(tag); - if(print) dump_method(prefix, "function", name, nr, pool); + trait->slot_id = swf_GetU30(tag); + trait->nr = swf_GetU30(tag); } else if(kind == 4) { // class - int slot_id = swf_GetU30(tag); - int cls = swf_GetU30(tag); - if(print) printf(" %sclass %s %d %d\n", prefix, name, slot_id, cls); + trait->slot_id = swf_GetU30(tag); + trait->cls = swf_GetU30(tag); + DEBUG printf(" class %s %d %d\n", name, trait->slot_id, trait->cls); } else if(kind == 0 || kind == 6) { // slot, const - int slot_id = swf_GetU30(tag); + trait->slot_id = swf_GetU30(tag); const char*type_name = dict_getstr(pool->multinames, swf_GetU30(tag)); - int vindex = swf_GetU30(tag); - if(vindex) { - U8 vkind = swf_GetU8(tag); + trait->vindex = swf_GetU30(tag); + if(trait->vindex) { + trait->vkind = swf_GetU8(tag); } - if(print) printf(" %sslot %s %d %s (vindex=%d)\n", prefix, name, slot_id, type_name, vindex); + DEBUG printf(" slot %s %d %s (vindex=%d)\n", name, trait->slot_id, type_name, trait->vindex); } else { printf(" can't parse trait type %d\n", kind); return 0; @@ -902,6 +620,41 @@ static dict_t* parse_traits(char*prefix, TAG*tag, abc_file_t*pool, char print) return traits; } +static void dump_traits(const char*prefix, dict_t*traits, abc_file_t*pool) +{ + int num_traits = traits->num; + int t; + for(t=0;tmultinames, trait->name_index); + U8 kind = trait->type; + U8 attributes = kind&0xf0; + kind&=0x0f; + if(kind == TRAIT_METHOD) { + dump_method(prefix, "method", name, trait->nr, pool); + } else if(kind == TRAIT_GETTER) { + dump_method(prefix, "getter", name, trait->nr, pool); + } else if(kind == TRAIT_SETTER) { + dump_method(prefix, "setter", name, trait->nr, pool); + } else if(kind == TRAIT_FUNCTION) { // function + dump_method(prefix, "function", name, trait->nr, pool); + } else if(kind == TRAIT_CLASS) { // class + abc_class_t*cls = (abc_class_t*)dict_getdata(pool->classes, trait->cls); + if(!cls) { + printf("%sslot %d: class %s=class%d %d\n", prefix, trait->slot_id, name, trait->cls); + } else { + printf("%sslot %d: class %s=%s\n", prefix, trait->slot_id, name, cls->name); + } + } else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const + int slot_id = trait->slot_id; + const char*type_name = dict_getstr(pool->multinames, trait->type_index); + printf(" %sslot %s %d %s (vindex=%d)\n", prefix, name, trait->slot_id, type_name, trait->vindex); + } else { + printf(" can't dump trait type %d\n", kind); + } + } +} + void swf_CopyData(TAG*to, TAG*from, int len) { unsigned char*data = malloc(len); @@ -916,21 +669,21 @@ abc_file_t*abc_file_new() memset(f, 0, sizeof(abc_file_t)); f->ints = dict_new(); - dict_append(f->ints, 0, (void*)0); + dict_append(f->ints, 0, (void*)(ptroff_t)0); f->uints = dict_new(); - dict_append(f->uints, 0, (void*)0); + dict_append(f->uints, 0, (void*)(ptroff_t)0); f->floats = dict_new(); dict_append(f->floats, 0, 0); f->strings = dict_new(); - dict_append(f->strings, "----", 0); + dict_append(f->strings, "----", 0); f->namespaces = dict_new(); - dict_append(f->namespaces, "----", 0); + dict_append(f->namespaces, "----", 0); f->namespace_sets = dict_new(); - dict_append(f->namespace_sets, "----", 0); + dict_append(f->namespace_sets, "----", 0); f->sets = dict_new(); - dict_append(f->sets, "----", 0); + dict_append(f->sets, "----", 0); f->multinames = dict_new(); - dict_append(f->multinames, "----", 0); + dict_append(f->multinames, "----", 0); // abc_file @@ -954,14 +707,14 @@ static char* access2str(int type) else return "undefined"; } -void swf_DissassembleABC(TAG*tag) +void* swf_ReadABC(TAG*tag) { abc_file_t* pool = abc_file_new(); swf_SetTagPos(tag, 0); - U32 flags = swf_GetU32(tag); + U32 abcflags = swf_GetU32(tag); int t; - DEBUG printf("flags=%08x\n", flags); + DEBUG printf("flags=%08x\n", abcflags); char*classname = swf_GetString(tag); U32 version = swf_GetU32(tag); if(version!=0x002e0010) { @@ -973,7 +726,7 @@ void swf_DissassembleABC(TAG*tag) for(t=1;tints, 0, (void*)v); + dict_append(pool->ints, 0, (void*)(ptroff_t)v); } int num_uints = swf_GetU30(tag); @@ -981,7 +734,7 @@ void swf_DissassembleABC(TAG*tag) for(t=1;tuints, 0, (void*)v); + dict_append(pool->uints, 0, (void*)(ptroff_t)v); } int num_floats = swf_GetU30(tag); @@ -1008,7 +761,7 @@ void swf_DissassembleABC(TAG*tag) U8 type = swf_GetU8(tag); int namenr = swf_GetU30(tag); const char*name = dict_getstr(pool->strings, namenr); - dict_append(pool->namespaces, name, (void*)(int)type); + dict_append(pool->namespaces, name, (void*)(ptroff_t)type); int w = 0; DEBUG w=1; if(w) { @@ -1021,7 +774,7 @@ void swf_DissassembleABC(TAG*tag) else if(type==0x05) printf("PrivateNs %s\n", name); else { printf("Undefined namespace type\n"); - return; + return 0; } } } @@ -1051,13 +804,21 @@ void swf_DissassembleABC(TAG*tag) int num_multinames = swf_GetU30(tag); DEBUG printf("%d multinames\n", num_multinames); for(t=1;ttype = swf_GetU8(tag); + + m->name_index = 0; + m->namespace_index = 0; + m->namespace_set_index = 0; + char*mname = 0; if(type==0x07 || type==0x0d) { - int nr1 = swf_GetU30(tag); + int nr1 = m->namespace_index = swf_GetU30(tag); const char*namespace = dict_getstr(pool->namespaces, nr1); - U8 access = (U8)(int)dict_getdata(pool->namespaces, nr1); - const char*methodname = dict_getstr(pool->strings, swf_GetU30(tag)); + U8 access = (U8)(ptroff_t)dict_getdata(pool->namespaces, nr1); + m->name_index = swf_GetU30(tag); + const char*methodname = dict_getstr(pool->strings, m->name_index); DEBUG printf("multiname %d) <%s> %s:%s\n", t, access2str(access), namespace, methodname); mname = malloc(strlen(namespace)+strlen(methodname)+300); sprintf(mname, "[%s]\0", access2str(access)); @@ -1065,26 +826,32 @@ void swf_DissassembleABC(TAG*tag) strcat(mname, ":"); strcat(mname, methodname); } else if(type==0x0f || type==0x10) { - const char*methodname = dict_getstr(pool->strings, swf_GetU30(tag)); + m->name_index = swf_GetU30(tag); + const char*methodname = dict_getstr(pool->strings, m->name_index); mname = strdup(methodname); } else if(type==0x11 || type==0x12) { + m->name_index = 0; mname = strdup(""); } else if(type==0x09 || type==0x0e) { - const char*methodname = dict_getstr(pool->strings, swf_GetU30(tag)); - const char*namespace = dict_getstr(pool->namespace_sets, swf_GetU30(tag)); + m->name_index = swf_GetU30(tag); + m->namespace_set_index = swf_GetU30(tag); + const char*methodname = dict_getstr(pool->strings, m->name_index); + const char*namespace = dict_getstr(pool->namespace_sets, m->namespace_set_index); DEBUG printf("multiname %d) %s:%s\n", t, namespace, methodname); mname = malloc(strlen(namespace)+strlen(methodname)+16); strcpy(mname, namespace); strcat(mname, ":"); strcat(mname, methodname); } else if(type==0x1b || type==0x1c) { - const char*nsset = dict_getstr(pool->namespace_sets, swf_GetU30(tag)); + m->name_index = 0; + m->namespace_set_index = swf_GetU30(tag); + const char*nsset = dict_getstr(pool->namespace_sets, m->namespace_set_index); mname = strdup(nsset); } else { printf("can't parse type %d multinames yet\n", type); - return; + return 0; } - dict_append(pool->multinames, mname, 0); + dict_append(pool->multinames, mname, m); free(mname); } @@ -1136,8 +903,10 @@ void swf_DissassembleABC(TAG*tag) } } if(m->flags&0x80) { - printf("can't parse param names yet\n"); - return; + /* debug information- not used by avm2 */ + for(s=0;sparam_count;s++) { + m->name = dict_getstr(pool->strings, swf_GetU30(tag)); + } } dict_append(pool->methods, m->name, m); } @@ -1149,11 +918,15 @@ void swf_DissassembleABC(TAG*tag) int classes_pos = tag->pos; DEBUG printf("%d classes\n", num_classes); for(t=0;tclasses, 0, cls); + DEBUG printf("class %d\n", t); swf_GetU30(tag); //classname swf_GetU30(tag); //supername - U8 flags = swf_GetU8(tag); - if(flags&8) + cls->flags = swf_GetU8(tag); + if(cls->flags&8) swf_GetU30(tag); //protectedNS int inum = swf_GetU30(tag); //interface count int s; @@ -1161,21 +934,19 @@ void swf_DissassembleABC(TAG*tag) const char*interface = dict_getstr(pool->multinames, swf_GetU30(tag)); DEBUG printf(" class %d interface: %s\n", t, interface); } - swf_GetU30(tag); //iinit - if(!parse_traits("", tag, pool, 0)) - return; + cls->iinit = swf_GetU30(tag); + cls->traits = traits_parse(tag, pool); } for(t=0;tclasses, t); + cls->static_constructor_index = swf_GetU30(tag); // cinit + cls->static_constructor_traits = traits_parse(tag, pool); } int num_scripts = swf_GetU30(tag); DEBUG printf("%d scripts\n", num_scripts); for(t=0;t= pool->methods->num) { printf("Invalid method number: %d\n", methodnr); - return; + return 0; } abc_method_t*m = (abc_method_t*)dict_getdata(pool->methods, methodnr); - abc_code_t*c = malloc(sizeof(abc_code_t)); - memset(c, 0, sizeof(abc_code_t)); + abc_method_body_t*c = malloc(sizeof(abc_method_body_t)); + memset(c, 0, sizeof(abc_method_body_t)); c->max_stack = swf_GetU30(tag); c->local_count = swf_GetU30(tag); c->init_scope_depth = swf_GetU30(tag); @@ -1210,9 +981,10 @@ void swf_DissassembleABC(TAG*tag) swf_GetU30(tag); //exc_type swf_GetU30(tag); //var_name } - c->traits = parse_traits("", tag, pool, 1); + c->traits = traits_parse(tag, pool); if(!c->traits) { - return; + fprintf(stderr, "Can't parse code traits\n"); + return 0; } DEBUG printf("method_body %d) (method %d), %d bytes of code", t, methodnr, code_length); int r,l = code_length>32?32:code_length; @@ -1224,26 +996,32 @@ void swf_DissassembleABC(TAG*tag) dict_append(pool->method_bodies, 0, c); } if(tag->len - tag->pos) { - printf("%d unparsed bytes remaining in ABC block\n", tag->len - tag->pos); - return; + fprintf(stderr, "%d unparsed bytes remaining in ABC block\n", tag->len - tag->pos); + return 0; } swf_SetTagPos(tag, classes_pos); for(t=0;tmultinames, swf_GetU30(tag)); - const char* supername = dict_getstr(pool->multinames, swf_GetU30(tag)); + abc_class_t*cls = (abc_class_t*)dict_getdata(pool->classes, t); + + cls->classname_index = swf_GetU30(tag); + cls->superclass_index = swf_GetU30(tag); + const char* classname = dict_getstr(pool->multinames, cls->classname_index); + const char* supername = dict_getstr(pool->multinames, cls->superclass_index); + cls->name = classname; - U8 flags = swf_GetU8(tag); + cls->flags = swf_GetU8(tag); const char*ns = ""; - if(flags&8) { + if(cls->flags&8) { cls->ns_index = swf_GetU30(tag); ns = dict_getstr(pool->namespaces, cls->ns_index); } - printf("class %s extends %s, %s, flags=%02x\n", classname, supername, ns, flags); + printf("class %s extends %s, %s, flags=%02x\n", classname, supername, ns, cls->flags); printf("{\n"); + dump_method(" ","staticconstructor", "", cls->static_constructor_index, pool); + dump_traits(" ", cls->static_constructor_traits, pool); + int num_interfaces = swf_GetU30(tag); //interface count int s; for(s=0;siinit = swf_GetU30(tag); dump_method(" ","constructor", classname, cls->iinit, pool); - cls->traits = parse_traits(" ",tag, pool, 1); + cls->traits = traits_parse(tag, pool); if(!cls->traits) { - return; + fprintf(stderr, "Can't parse class traits\n"); + return 0; } - printf("}\n"); - dict_append(pool->classes, 0, cls); + dump_traits(" ",cls->traits, pool); + + printf("}\n"); } for(t=0;tmethods, init); + + abc_script_t*s = malloc(sizeof(abc_script_t)); + memset(s, 0, sizeof(abc_script_t)); + s->method = m; + s->traits = traits_parse(tag, pool); + dict_append(pool->scripts, 0, s); + if(!s->traits) { + fprintf(stderr, "Can't parse script traits\n"); + return 0; + } + dump_method("","initmethod", "init", init, pool); + dump_traits("", s->traits, pool); } + return pool; } static int registerNameSpace(abc_file_t*file, U8 access, char*name) { @@ -1303,13 +1093,13 @@ static int registerNameSpace(abc_file_t*file, U8 access, char*name) { int t; for(t=0;tnamespaces->num;t++) { const char*name2 = dict_getstr(file->namespaces, t); - U8 access2 = (U8)(int)dict_getdata(file->namespaces, t); + U8 access2 = (U8)(ptroff_t)dict_getdata(file->namespaces, t); if(access == access2 && !strcmp(name, name2)) { return t; } } dict_update(file->strings, name, 0); - return dict_append(file->namespaces, name, (void*)(int)access); + return dict_append(file->namespaces, name, (void*)(ptroff_t)access); } int abc_RegisterNameSpace(abc_file_t*file, char*name) { return registerNameSpace(file, 0x08, name); @@ -1332,11 +1122,11 @@ int abc_RegisterStaticProtectedNameSpace(abc_file_t*file, char*name) { int abc_RegisterPrivateNameSpace(abc_file_t*file, char*name) { return registerNameSpace(file, 0x05, name); } -static int multiname_index(abc_file_t*abc, const char*name2) +static int multiname_index(abc_file_t*pool, const char*name2) { if(!name2) name2 = ":"; - int pos = dict_find(abc->multinames, name2); + int pos = dict_find(pool->multinames, name2); if(pos>=0) return pos; @@ -1353,46 +1143,48 @@ static int multiname_index(abc_file_t*abc, const char*name2) name = p+1; } abc_multiname_t*m = malloc(sizeof(abc_multiname_t)); - m->namespace_index = registerNameSpace(abc, 0, namespace); - m->name_index = dict_append_if_new(abc->strings, name, 0); - return dict_append(abc->multinames, name2, m); + m->namespace_index = registerNameSpace(pool, 0, namespace); + m->name_index = dict_append_if_new(pool->strings, name, 0); + return dict_append(pool->multinames, name2, m); } -abc_class_t* abc_NewClass(abc_file_t*abc, char*classname, char*superclass) { +abc_class_t* abc_NewClass(abc_file_t*pool, char*classname, char*superclass) { abc_class_t* c = malloc(sizeof(abc_class_t)); memset(c, 0, sizeof(abc_class_t)); - c->index = dict_append(abc->classes, 0, c); - c->abc = abc; + c->index = dict_append(pool->classes, 0, c); + c->pool = pool; c->name = strdup(classname); - c->classname_index = multiname_index(abc, classname); - c->superclass_index = multiname_index(abc, superclass); - c->ns_index = abc_RegisterProtectedNameSpace(abc, classname); + c->classname_index = multiname_index(pool, classname); + c->superclass_index = multiname_index(pool, superclass); + c->ns_index = abc_RegisterProtectedNameSpace(pool, classname); c->iinit = -1; - c->cinit = -1; + c->static_constructor_index = -1; + c->flags = 0x08; c->traits = dict_new(); return c; } -abc_code_t* add_method(abc_file_t*abc, abc_class_t*cls, char*returntype, char*name, int num_params, va_list va) +abc_method_body_t* add_method(abc_file_t*pool, abc_class_t*cls, char*returntype, char*name, int num_params, va_list va) { /* construct code (method body) object */ - abc_code_t* c = malloc(sizeof(abc_code_t)); - memset(c, 0, sizeof(abc_code_t)); - c->index = dict_append(abc->method_bodies, 0, c); + abc_method_body_t* c = malloc(sizeof(abc_method_body_t)); + memset(c, 0, sizeof(abc_method_body_t)); + c->index = dict_append(pool->method_bodies, 0, c); c->tag = swf_InsertTag(0,0); - c->abc = abc; + c->pool = pool; c->traits = dict_new(); /* construct method object */ abc_method_t* m = malloc(sizeof(abc_method_t)); memset(m, 0, sizeof(abc_method_t)); m->param_count = num_params; - m->index = dict_append(abc->methods, 0, m); - if(returntype) - m->return_type_index = multiname_index(abc, returntype); - else + m->index = dict_append(pool->methods, 0, m); + if(returntype && strcmp(returntype, "void")) { + m->return_type_index = multiname_index(pool, returntype); + } else { m->return_type_index = 0; + } if(num_params>sizeof(m->params)/sizeof(m->params[0])) { fprintf(stderr, "abc: Too many parameters\n"); return 0; @@ -1400,7 +1192,7 @@ abc_code_t* add_method(abc_file_t*abc, abc_class_t*cls, char*returntype, char*na int t; for(t=0;tparams[t] = multiname_index(abc, param); + m->params[t] = multiname_index(pool, param); } /* crosslink the two objects */ @@ -1410,23 +1202,23 @@ abc_code_t* add_method(abc_file_t*abc, abc_class_t*cls, char*returntype, char*na return c; } -abc_code_t* abc_AddConstructor(abc_class_t*cls, char*returntype, int num_params, ...) +abc_method_body_t* abc_AddConstructor(abc_class_t*cls, char*returntype, int num_params, ...) { va_list va; va_start(va, num_params); - abc_code_t* c = add_method(cls->abc, cls, returntype, 0, num_params, va); + abc_method_body_t* c = add_method(cls->pool, cls, returntype, 0, num_params, va); va_end(va); cls->iinit = c->index; return c; } -abc_code_t* abc_AddStaticConstructor(abc_class_t*cls, char*returntype, int num_params, ...) +abc_method_body_t* abc_AddStaticConstructor(abc_class_t*cls, char*returntype, int num_params, ...) { va_list va; va_start(va, num_params); - abc_code_t* c = add_method(cls->abc, cls, returntype, 0, num_params, va); + abc_method_body_t* c = add_method(cls->pool, cls, returntype, 0, num_params, va); va_end(va); - cls->cinit = c->index; + cls->static_constructor_index = c->index; return c; } @@ -1443,40 +1235,54 @@ abc_trait_t*trait_new(int type, int name_index, int data1, int data2, int vindex return trait; } -abc_code_t* abc_AddMethod(abc_class_t*cls, char*returntype, char*name, int num_params, ...) +abc_method_body_t* abc_AddMethod(abc_class_t*cls, char*returntype, char*name, int num_params, ...) { - abc_file_t*abc = cls->abc; + abc_file_t*pool = cls->pool; va_list va; va_start(va, num_params); - abc_code_t* c = add_method(cls->abc, cls, returntype, name, num_params, va); + abc_method_body_t* c = add_method(cls->pool, cls, returntype, name, num_params, va); va_end(va); - dict_append(cls->traits, 0, trait_new(TRAIT_METHOD, multiname_index(abc, name), 0, c->method->index, 0, 0)); + dict_append(cls->traits, 0, trait_new(TRAIT_METHOD, multiname_index(pool, name), 0, c->method->index, 0, 0)); return c; } void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*multiname) { - abc_file_t*abc = cls->abc; - int i = multiname_index(abc, name); - dict_append(cls->traits, 0, trait_new(TRAIT_SLOT, i, slot, multiname_index(abc, multiname), 0, 0)); + abc_file_t*pool = cls->pool; + int i = multiname_index(pool, name); + dict_append(cls->traits, 0, trait_new(TRAIT_SLOT, i, slot, multiname_index(pool, multiname), 0, 0)); } -void abc_code_addClassTrait(abc_code_t*code, char*multiname, int slotid, abc_class_t*cls) +void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls) { - abc_file_t*abc = code->abc; - int i = multiname_index(abc, multiname); + abc_file_t*pool = code->pool; + int i = multiname_index(pool, multiname); abc_trait_t*trait = trait_new(TRAIT_CLASS, i, slotid, cls->index, 0, 0); dict_append(code->traits, 0, trait); } -abc_code_t* abc_AddInitScript(abc_file_t*abc, char*returntype, int num_params, ...) +/* notice: traits of a method (body) belonging to an init script + and traits of the init script are *not* the same thing */ +void abc_initscript_addClassTrait(abc_script_t*script, char*multiname, int slotid, abc_class_t*cls) +{ + abc_file_t*pool = script->pool; + int i = multiname_index(pool, multiname); + abc_trait_t*trait = trait_new(TRAIT_CLASS, i, slotid, cls->index, 0, 0); + dict_append(script->traits, 0, trait); +} + +abc_script_t* abc_AddInitScript(abc_file_t*pool, char*returntype, int num_params, ...) { va_list va; va_start(va, num_params); - abc_code_t* c = add_method(abc, 0, returntype, 0, num_params, va); - dict_append(abc->scripts, 0, c); + abc_method_body_t* c = add_method(pool, 0, returntype, 0, num_params, va); + abc_script_t* s = malloc(sizeof(abc_script_t)); + s->method = c->method; + s->traits = dict_new(); + s->pool = pool; + dict_append(pool->scripts, 0, s); va_end(va); - return c; + return s; } void swf_SetU30(TAG*tag, U32 u) @@ -1493,8 +1299,12 @@ void swf_SetU30String(TAG*tag, const char*str) swf_SetBlock(tag, (void*)str, l); } -static void write_traits(abc_file_t*abc, TAG*tag, dict_t*traits) +static void write_traits(abc_file_t*pool, TAG*tag, dict_t*traits) { + if(!traits) { + swf_SetU30(tag, 0); + return; + } swf_SetU30(tag, traits->num); int s; @@ -1513,28 +1323,30 @@ static void write_traits(abc_file_t*abc, TAG*tag, dict_t*traits) } } -void swf_WriteABC(TAG*tag, abc_file_t*abc) +void swf_WriteABC(TAG*tag, void*code) { + abc_file_t*pool = (abc_file_t*)code; + swf_SetU32(tag, 1); swf_SetU8(tag, 0); swf_SetU16(tag, 0x10); swf_SetU16(tag, 0x2e); - swf_SetU30(tag, abc->ints->num>1?abc->ints->num:0); + swf_SetU30(tag, pool->ints->num>1?pool->ints->num:0); // ... - swf_SetU30(tag, abc->uints->num>1?abc->uints->num:0); + swf_SetU30(tag, pool->uints->num>1?pool->uints->num:0); // ... - swf_SetU30(tag, abc->floats->num>1?abc->floats->num:0); + swf_SetU30(tag, pool->floats->num>1?pool->floats->num:0); // ... - swf_SetU30(tag, abc->strings->num>1?abc->strings->num:0); + swf_SetU30(tag, pool->strings->num>1?pool->strings->num:0); int t; - for(t=1;tstrings->num;t++) { - swf_SetU30String(tag, dict_getstr(abc->strings, t)); + for(t=1;tstrings->num;t++) { + swf_SetU30String(tag, dict_getstr(pool->strings, t)); } - swf_SetU30(tag, abc->namespaces->num>1?abc->namespaces->num:0); - for(t=1;tnamespaces->num;t++) { - U8 type = (U8)(int)dict_getdata(abc->namespaces, t); - const char*name = dict_getstr(abc->namespaces, t); - int i = dict_find(abc->strings, name); + swf_SetU30(tag, pool->namespaces->num>1?pool->namespaces->num:0); + for(t=1;tnamespaces->num;t++) { + U8 type = (U8)(ptroff_t)dict_getdata(pool->namespaces, t); + const char*name = dict_getstr(pool->namespaces, t); + int i = dict_find(pool->strings, name); if(i<0) { fprintf(stderr, "Couldn't find namespace \"%s\" in constant pool\n", name); return; @@ -1542,21 +1354,21 @@ void swf_WriteABC(TAG*tag, abc_file_t*abc) swf_SetU8(tag, type); swf_SetU30(tag, i); } - swf_SetU30(tag, abc->sets->num>1?abc->sets->num:0); + swf_SetU30(tag, pool->sets->num>1?pool->sets->num:0); // ... - swf_SetU30(tag, abc->multinames->num>1?abc->multinames->num:0); + swf_SetU30(tag, pool->multinames->num>1?pool->multinames->num:0); // ... - for(t=1;tmultinames->num;t++) { - abc_multiname_t*m = (abc_multiname_t*)dict_getdata(abc->multinames, t); + for(t=1;tmultinames->num;t++) { + abc_multiname_t*m = (abc_multiname_t*)dict_getdata(pool->multinames, t); swf_SetU8(tag, 0x07); swf_SetU30(tag, m->namespace_index); swf_SetU30(tag, m->name_index); } - swf_SetU30(tag, abc->methods->num); - for(t=0;tmethods->num;t++) { - abc_method_t*m = (abc_method_t*)dict_getdata(abc->methods, t); + swf_SetU30(tag, pool->methods->num); + for(t=0;tmethods->num;t++) { + abc_method_t*m = (abc_method_t*)dict_getdata(pool->methods, t); swf_SetU30(tag, m->param_count); swf_SetU30(tag, m->return_type_index); int s; @@ -1569,15 +1381,16 @@ void swf_WriteABC(TAG*tag, abc_file_t*abc) swf_SetU30(tag, 0);//metadata - swf_SetU30(tag, abc->classes->num); + swf_SetU30(tag, pool->classes->num); - for(t=0;tclasses->num;t++) { - abc_class_t*c = (abc_class_t*)dict_getdata(abc->classes, t); + for(t=0;tclasses->num;t++) { + abc_class_t*c = (abc_class_t*)dict_getdata(pool->classes, t); swf_SetU30(tag, c->classname_index); swf_SetU30(tag, c->superclass_index); - swf_SetU8(tag, 8); // flags - swf_SetU30(tag, c->ns_index); + swf_SetU8(tag, c->flags); // flags + if(c->flags&0x08) + swf_SetU30(tag, c->ns_index); swf_SetU30(tag, 0); // no interfaces if(c->iinit<0) { @@ -1585,28 +1398,28 @@ void swf_WriteABC(TAG*tag, abc_file_t*abc) return; } swf_SetU30(tag, c->iinit); - write_traits(abc, tag, c->traits); + write_traits(pool, tag, c->traits); } - for(t=0;tclasses->num;t++) { - abc_class_t*c = (abc_class_t*)dict_getdata(abc->classes, t); - if(c->cinit<0) { - fprintf(stderr, "Error: Class %s has no constructor\n", c->name); + for(t=0;tclasses->num;t++) { + abc_class_t*c = (abc_class_t*)dict_getdata(pool->classes, t); + if(c->static_constructor_index<0) { + fprintf(stderr, "Error: Class %s has no static constructor\n", c->name); return; } - swf_SetU30(tag, c->cinit); - swf_SetU30(tag, 0); // no traits + swf_SetU30(tag, c->static_constructor_index); + write_traits(pool, tag, c->static_constructor_traits); } - swf_SetU30(tag, abc->scripts->num); - for(t=0;tscripts->num;t++) { - abc_code_t*c = (abc_code_t*)dict_getdata(abc->scripts, t); - swf_SetU30(tag, c->index); //!=t! - write_traits(abc, tag, c->traits); + swf_SetU30(tag, pool->scripts->num); + for(t=0;tscripts->num;t++) { + abc_script_t*s = (abc_script_t*)dict_getdata(pool->scripts, t); + swf_SetU30(tag, s->method->index); //!=t! + write_traits(pool, tag, s->traits); } - swf_SetU30(tag, abc->method_bodies->num); - for(t=0;tmethod_bodies->num;t++) { - abc_code_t*c = (abc_code_t*)dict_getdata(abc->method_bodies, t); + swf_SetU30(tag, pool->method_bodies->num); + for(t=0;tmethod_bodies->num;t++) { + abc_method_body_t*c = (abc_method_body_t*)dict_getdata(pool->method_bodies, t); abc_method_t*m = c->method; swf_SetU30(tag, m->index); swf_SetU30(tag, c->max_stack); @@ -1616,7 +1429,7 @@ void swf_WriteABC(TAG*tag, abc_file_t*abc) swf_SetU30(tag, c->tag->len); swf_SetBlock(tag, c->tag->data, c->tag->len); swf_SetU30(tag, c->exception_count); - swf_SetU8(tag, 0); // no traits + write_traits(pool, tag, c->traits); } } @@ -1624,47 +1437,77 @@ void swf_WriteABC(TAG*tag, abc_file_t*abc) void swf_AddButtonLinks(TAG*tag) { - abc_file_t*abc = abc_file_new(); - abc_code_t*c = 0; - - abc_class_t*maintimeline = abc_NewClass(abc, "buttonmitlink_fla:MainTimeline", "flash.display:MovieClip"); - - c = abc_AddStaticConstructor(maintimeline, 0, 0); + abc_file_t*file = abc_file_new(); + abc_method_body_t*c = 0; + + abc_class_t*cls = abc_NewClass(file, "buttonmitlink_fla:MainTimeline", "flash.display:MovieClip"); + + + c = abc_AddStaticConstructor(cls, "void", 0); c->max_stack = 1; c->local_count = 1; c->init_scope_depth = 9; c->max_scope_depth = 10; + abc_getlocal_0(c); abc_pushscope(c); abc_returnvoid(c); - - c = abc_AddMethod(maintimeline, 0, "[packageinternal]buttonmitlink_fla:frame1", 0); + + + c = abc_AddConstructor(cls, 0, 0); c->max_stack = 3; c->local_count = 1; c->init_scope_depth = 10; c->max_scope_depth = 11; + abc_getlocal_0(c); abc_pushscope(c); + + abc_getlocal_0(c); + abc_constructsuper(c,0); + + abc_getlex(c, "[package]flash.system:Security"); + abc_pushstring(c, "*"); + abc_callpropvoid(c, "[package]:allowDomain", 1); + + //abc_getlocal_0(c); + //abc_constructsuper(c,0); + + abc_findpropstrict(c,":addFrameScript"); + abc_pushbyte(c,0x00); + abc_getlex(c,"[packageinternal]buttonmitlink_fla:frame1"); + abc_callpropvoid(c,":addFrameScript",2); + + abc_getlex(c,":MyButton1"); + abc_getlex(c,"flash.events:MouseEvent"); + abc_getproperty(c, ":CLICK"); + abc_getlex(c, ":gotoPage1"); + abc_callpropvoid(c, ":addEventListener" ,2); + + abc_getlex(c,":MyButton2"); + abc_getlex(c,"flash.events:MouseEvent"); + abc_getproperty(c, ":CLICK"); + abc_getlex(c,":gotoPage2"); + abc_callpropvoid(c,":addEventListener",2); abc_returnvoid(c); - - abc_AddSlot(maintimeline, ":MyButton1", 0, "flash.display:SimpleButton"); - abc_AddSlot(maintimeline, ":MyButton2", 0, "flash.display:SimpleButton"); - c = abc_AddMethod(maintimeline, ":void", ":gotoPage2", 1, "flash.events:MouseEvent"); + + c = abc_AddMethod(cls, 0, "[packageinternal]buttonmitlink_fla:frame1", 0); c->max_stack = 3; - c->local_count = 2; + c->local_count = 1; c->init_scope_depth = 10; c->max_scope_depth = 11; + abc_getlocal_0(c); abc_pushscope(c); - abc_findpropstrict(c, "flash.net:navigateToURL"); - abc_findpropstrict(c, "flash.net:URLRequest"); - abc_pushstring(c, "http://www.quiss.org"); - abc_constructprop(c, "flash.net:URLRequest", 1); - abc_callpropvoid(c, "flash.net:navigateToURL", 1); abc_returnvoid(c); + - c = abc_AddMethod(maintimeline, ":void", ":gotoPage1", 1, "flash.events:MouseEvent"); + abc_AddSlot(cls, ":MyButton1", 0, "flash.display:SimpleButton"); + abc_AddSlot(cls, ":MyButton2", 0, "flash.display:SimpleButton"); + + + c = abc_AddMethod(cls, ":void", ":gotoPage1", 1, "flash.events:MouseEvent"); c->max_stack = 3; c->local_count = 2; c->init_scope_depth = 10; @@ -1674,41 +1517,31 @@ void swf_AddButtonLinks(TAG*tag) abc_findpropstrict(c,"flash.net:navigateToURL"); abc_findpropstrict(c,"flash.net:URLRequest"); abc_pushstring(c,"http://www.google.com/"); + //abc_pushstring(c,"file:///home/kramm/c/swftools/lib/modules/test2.html"); abc_constructprop(c,"flash.net:URLRequest", 1); abc_callpropvoid(c,"flash.net:navigateToURL", 1); abc_returnvoid(c); - - c = abc_AddConstructor(maintimeline, 0, 0); + + + c = abc_AddMethod(cls, ":void", ":gotoPage2", 1, "flash.events:MouseEvent"); c->max_stack = 3; - c->local_count = 1; + c->local_count = 2; c->init_scope_depth = 10; c->max_scope_depth = 11; - abc_getlocal_0(c); abc_pushscope(c); + abc_findpropstrict(c, "flash.net:navigateToURL"); + abc_findpropstrict(c, "flash.net:URLRequest"); + abc_pushstring(c, "http://www.quiss.org"); + //abc_pushstring(c, "file:///home/kramm/c/swftools/lib/modules/test1.html"); + abc_constructprop(c, "flash.net:URLRequest", 1); + abc_callpropvoid(c, "flash.net:navigateToURL", 1); + abc_returnvoid(c); - abc_getlocal_0(c); - abc_constructsuper(c,0); - abc_findpropstrict(c,":addFrameScript"); - abc_pushbyte(c,0x00); - abc_getlex(c,"[packageinternal]buttonmitlink_fla:frame1"); - abc_callpropvoid(c,":addFrameScript",2); - - abc_getlex(c,":MyButton1"); - abc_getlex(c,"flash.events:MouseEvent"); - abc_getproperty(c, ":CLICK"); - abc_getlex(c, ":gotoPage1"); - abc_callpropvoid(c, ":addEventListener" ,2); - abc_getlex(c,":MyButton2"); - abc_getlex(c,"flash.events:MouseEvent"); - abc_getproperty(c, ":CLICK"); - abc_getlex(c,":gotoPage2"); - abc_callpropvoid(c,":addEventListener",2); - abc_returnvoid(c); - - c = abc_AddInitScript(abc, 0, 0); + abc_script_t*s = abc_AddInitScript(file, 0, 0); + c = (abc_method_body_t*)dict_getdata(file->method_bodies, s->method->method_body_index); c->max_stack = 2; c->local_count = 1; c->init_scope_depth = 1; @@ -1731,7 +1564,7 @@ void swf_AddButtonLinks(TAG*tag) abc_getlex(c,"flash.display:MovieClip"); abc_pushscope(c); abc_getlex(c,"flash.display:MovieClip"); - abc_newclass(c,maintimeline); + abc_newclass(c,cls); abc_popscope(c); abc_popscope(c); abc_popscope(c); @@ -1742,7 +1575,9 @@ void swf_AddButtonLinks(TAG*tag) abc_initproperty(c,"buttonmitlink_fla:MainTimeline"); abc_returnvoid(c); - abc_code_addClassTrait(c, "buttonmitlink_fla:MainTimeline", 1, maintimeline); + //abc_method_body_addClassTrait(c, "buttonmitlink_fla:MainTimeline", 1, cls); + abc_initscript_addClassTrait(s, "buttonmitlink_fla:MainTimeline", 1, cls); - swf_WriteABC(tag, abc); + swf_WriteABC(tag, file); } +