#include "../rfxswf.h"
#include "../q.h"
#include "abc.h"
+#include "assets.h"
char stringbuffer[2048];
fprintf(fo, "(");
while(l) {
char*s = multiname_tostring(l->multiname);
- fprintf(fo, s);
+ fprintf(fo, "%s", s);
free(s);
if(i>=n-no) {
s = constant_tostring(o->constant);
fprintf(fo, " = ");
- fprintf(fo, s);
+ fprintf(fo, "%s", s);
free(s);
o = o->next;
}
int t;
int num_metadata = swf_GetU30(tag);
- DEBUG printf("%d metadata\n");
+ DEBUG printf("%d metadata\n", num_metadata);
for(t=0;t<num_metadata;t++) {
const char*entry_name = pool_lookup_string(pool, swf_GetU30(tag));
int num = swf_GetU30(tag);
abc_class_t* abc_class_new(abc_file_t*file, multiname_t*classname, multiname_t*superclass) {
NEW(abc_class_t,c);
- array_append(file->classes, NO_KEY, c);
+ if(file)
+ array_append(file->classes, NO_KEY, c);
c->file = file;
c->classname = multiname_clone(classname);
{
list_append(c->interfaces, multiname_clone(interface));
}
+char*abc_class_fullname(abc_class_t*cls)
+{
+ const char*package = cls->classname->ns->name;
+ const char*name = cls->classname->name;
+ int l1 = strlen(package);
+ int l2 = strlen(name);
+ char*fullname = malloc(l1+l2+2);
+ if(l1) {
+ memcpy(fullname, package, l1);
+ fullname[l1++]='.';
+ }
+ memcpy(fullname+l1, name, l2+1);
+ return fullname;
+}
-abc_method_t* abc_method_new(abc_file_t*file, multiname_t*returntype, char body)
+void abc_method_init(abc_method_t*m, abc_file_t*file, multiname_t*returntype, char body)
{
/* construct method object */
- NEW(abc_method_t,m);
m->index = array_length(file->methods);
array_append(file->methods, NO_KEY, m);
m->return_type = returntype;
m->body = c;
c->method = m;
}
-
+}
+abc_method_t* abc_method_new(abc_file_t*file, multiname_t*returntype, char body)
+{
+ NEW(abc_method_t,m);
+ abc_method_init(m, file, returntype, body);
return m;
}
}
-trait_t* abc_class_find_slotid(abc_class_t*cls, int slotid)
+trait_t* traits_find_slotid(trait_list_t*traits, int slotid)
{
trait_list_t*l;
trait_t*t=0;
- for(l=cls->traits;l;l=l->next) {
+ for(l=traits;l;l=l->next) {
if(l->trait->slot_id==slotid) {
t=l->trait;
break;
/* notice: traits of a method (body) belonging to an init script
and traits of the init script are *not* the same thing */
-int abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc_class_t*cls)
+trait_t* abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc_class_t*cls)
{
abc_file_t*file = script->file;
multiname_t*m = multiname_clone(multiname);
trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0);
trait->cls = cls;
list_append(script->traits, trait);
- return slotid;
+ return trait;
}
abc_script_t* abc_initscript(abc_file_t*file)
if(m->return_type)
return_type = multiname_tostring(m->return_type);
else
- return_type = strdup("void");
+ return_type = strdup("*");
fprintf(fo, "%s", prefix);
- fprintf(fo, "%s %s", attr, type);
+ fprintf(fo, "%s %s ", attr, type);
fprintf(fo, "%s %s=%s", return_type, name, m->name);
params_dump(fo, m->parameters, m->optional_parameters);
fprintf(fo, "(%d params, %d optional)\n", list_length(m->parameters), list_length(m->optional_parameters));
} else if(kind == TRAIT_CLASS) { // class
trait->slot_id = swf_GetU30(tag);
trait->cls = (abc_class_t*)array_getvalue(file->classes, swf_GetU30(tag));
- DEBUG printf(" class %s %d %d\n", name, trait->slot_id, trait->cls);
+ DEBUG printf(" class %s %d %08x\n", name, trait->slot_id, (int)trait->cls);
} else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
trait->slot_id = swf_GetU30(tag);
trait->type_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
char*value = constant_tostring(trait->value);
fprintf(fo, "%sslot %d: %s %s:%s %s %s\n", prefix, trait->slot_id,
kind==TRAIT_CONST?"const":"var", name, type_name,
- value?"=":"", value?value:"");
+ trait->value?"=":"", trait->value?value:"");
if(value) free(value);
free(type_name);
} else {
int s;
array_t*items = (array_t*)array_getvalue(file->metadata, t);
for(s=0;s<items->num;s++) {
- fprintf(fo, "%s# %s=%s\n", prefix, array_getkey(items, s), array_getvalue(items,s));
+ fprintf(fo, "%s# %s=%s\n", prefix, (char*)array_getkey(items, s), (char*)array_getvalue(items,s));
}
fprintf(fo, "%s#\n", prefix);
}
char*supername = multiname_tostring(cls->superclass);
fprintf(fo, " extends %s", supername);
free(supername);
+ }
+ if(cls->interfaces) {
multiname_list_t*ilist = cls->interfaces;
if(ilist)
fprintf(fo, " implements");
dump_method(fo, prefix2, "", "constructor", n, cls->constructor, file, methods_seen);
free(n);
traits_dump(fo, prefix2,cls->traits, file, methods_seen);
+
+ if(cls->asset) {
+ swf_DumpAsset(fo, cls->asset, prefix2);
+ }
+
fprintf(fo, "%s}\n", prefix);
}
fprintf(fo, "%s\n", prefix);
}
pool_read(pool, tag);
- //pool_dump(pool, stdout);
int num_methods = swf_GetU30(tag);
DEBUG printf("%d methods\n", num_methods);
for(s=0;s<param_count;s++) {
int type_index = swf_GetU30(tag);
- /* type_index might be 0, which probably means "..." (varargs) */
+ /* type_index might be 0 ("*") */
multiname_t*param = type_index?multiname_clone(pool_lookup_multiname(pool, type_index)):0;
list_append(m->parameters, param);
}
m->flags = swf_GetU8(tag);
- DEBUG printf("method %d) %s ", m->name);
+ DEBUG printf("method %d) %s ", t, m->name);
DEBUG params_dump(stdout, m->parameters, m->optional_parameters);
- DEBUG printf("flags=%02x\n", t, m->flags);
+ DEBUG printf("flags=%02x\n", m->flags);
if(m->flags&0x08) {
m->optional_parameters = list_new();
array_append(file->method_bodies, NO_KEY, c);
}
if(tag->len - tag->pos) {
- fprintf(stderr, "%d unparsed bytes remaining in ABC block\n", tag->len - tag->pos);
+ fprintf(stderr, "ERROR: %d unparsed bytes remaining in ABC block\n", tag->len - tag->pos);
return 0;
}
return file;
}
-void swf_WriteABC(TAG*abctag, void*code)
+static pool_t*writeABC(TAG*abctag, void*code, pool_t*pool)
{
abc_file_t*file = (abc_file_t*)code;
- pool_t*pool = pool_new();
+ if(!pool)
+ pool = pool_new();
+ if(!file)
+ file = abc_file_new();
TAG*tmp = swf_InsertTag(0,0);
TAG*tag = tmp;
NEW(abc_method_body_t,body);array_append(file->method_bodies, NO_KEY, body);
// don't bother to set m->index
body->method = m; m->body = body;
- __ returnvoid(body);
+ if(c->superclass && c->superclass->name && strcmp(c->superclass->name,"Object")) {
+ body->code = abc_getlocal_0(body->code);
+ body->code = abc_constructsuper(body->code, 0);
+ }
+ body->code = abc_returnvoid(body->code);
c->constructor = m;
} else {
NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m);
NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m);
NEW(abc_method_body_t,body);array_append(file->method_bodies, NO_KEY, body);
body->method = m; m->body = body;
- __ returnvoid(body);
+ body->code = abc_returnvoid(0);
c->static_constructor = m;
}
}
swf_SetU30(tag, file->scripts->num);
for(t=0;t<file->scripts->num;t++) {
abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t);
+ if(!s->method->body || !s->method->body->code) {
+ fprintf(stderr, "Internal Error: initscript has no body\n");
+ }
swf_SetU30(tag, s->method->index); //!=t!
traits_write(pool, tag, s->traits);
}
swf_SetBlock(tag, tmp->data, tmp->len);
swf_DeleteTag(0, tmp);
+ return pool;
+}
+
+void swf_WriteABC(TAG*abctag, void*code)
+{
+ pool_t*pool = writeABC(abctag, code, 0);
+ pool_optimize(pool);
+ swf_ResetTag(abctag, abctag->id);
+ writeABC(abctag, code, pool);
pool_destroy(pool);
}
void abc_file_free(abc_file_t*file)
{
+ if(!file)
+ return;
int t;
if(file->metadata) {
for(t=0;t<file->metadata->num;t++) {
abc_file_free(file);
}
-void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
-{
- int num_frames = 0;
- int has_buttons = 0;
- TAG*tag=swf->firstTag;
- while(tag) {
- if(tag->id == ST_SHOWFRAME)
- num_frames++;
- if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2)
- has_buttons = 1;
- tag = tag->next;
- }
-
- abc_file_t*file = abc_file_new();
- abc_method_body_t*c = 0;
-
- abc_class_t*cls = abc_class_new2(file, "rfx::MainTimeline", "flash.display::MovieClip");
- abc_class_protectedNS(cls, "rfx:MainTimeline");
-
- TAG*abctag = swf_InsertTagBefore(swf, swf->firstTag, ST_DOABC);
-
- tag = swf_InsertTag(abctag, ST_SYMBOLCLASS);
- swf_SetU16(tag, 1);
- swf_SetU16(tag, 0);
- swf_SetString(tag, "rfx.MainTimeline");
-
- c = abc_class_getstaticconstructor(cls, 0)->body;
- c->old.max_stack = 1;
- c->old.local_count = 1;
- c->old.init_scope_depth = 9;
- c->old.max_scope_depth = 10;
-
- __ getlocal_0(c);
- __ pushscope(c);
- __ returnvoid(c);
-
- c = abc_class_getconstructor(cls, 0)->body;
- c->old.max_stack = 3;
- c->old.local_count = 1;
- c->old.init_scope_depth = 10;
- c->old.max_scope_depth = 11;
-
- debugfile(c, "constructor.as");
-
- __ getlocal_0(c);
- __ pushscope(c);
-
- __ getlocal_0(c);
- __ constructsuper(c,0);
-
- __ getlex(c, "[package]flash.system::Security");
- __ pushstring(c, "*");
- __ callpropvoid(c, "[package]::allowDomain", 1);
-
- if(stop_each_frame || has_buttons) {
- int frame = 0;
- tag = swf->firstTag;
- abc_method_body_t*f = 0; //frame script
- while(tag && tag->id!=ST_END) {
- char framename[80];
- char needs_framescript=0;
- char buttonname[80];
- char functionname[80];
- sprintf(framename, "[packageinternal]rfx::frame%d", frame);
-
- if(!f && (tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2 || stop_each_frame)) {
- /* make the contructor add a frame script */
- __ findpropstrict(c,"[package]::addFrameScript");
- __ pushbyte(c,frame);
- __ getlex(c,framename);
- __ callpropvoid(c,"[package]::addFrameScript",2);
-
- f = abc_class_method(cls, 0, multiname_fromstring(framename))->body;
- f->old.max_stack = 3;
- f->old.local_count = 1;
- f->old.init_scope_depth = 10;
- f->old.max_scope_depth = 11;
- __ debugfile(f, "framescript.as");
- __ debugline(f, 1);
- __ getlocal_0(f);
- __ pushscope(f);
- if(stop_each_frame) {
- __ findpropstrict(f, "[package]::stop");
- __ callpropvoid(f, "[package]::stop", 0);
- }
- }
-
- if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
- U16 id = swf_GetDefineID(tag);
- sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
- __ getlex(f,buttonname);
- __ getlex(f,"flash.events::MouseEvent");
- __ getproperty(f, "::CLICK");
- sprintf(functionname, "::clickbutton%d", swf_GetDefineID(tag));
- __ getlex(f,functionname);
- __ callpropvoid(f, "::addEventListener" ,2);
-
- needs_framescript = 1;
-
- abc_method_body_t*h =
- abc_class_method(cls, 0, multiname_fromstring(functionname))->body;
- list_append(h->method->parameters, multiname_fromstring("flash.events::MouseEvent"));
-
- h->old.max_stack = 6;
- h->old.local_count = 2;
- h->old.init_scope_depth = 10;
- h->old.max_scope_depth = 11;
- __ getlocal_0(h);
- __ pushscope(h);
-
- ActionTAG*oldaction = swf_ButtonGetAction(tag);
- if(oldaction && oldaction->op == ACTION__GOTOFRAME) {
- int framenr = GET16(oldaction->data);
- if(framenr>254) {
- fprintf(stderr, "Warning: Couldn't translate jump to frame %d to flash 9 actionscript\n", framenr);
- }
- if(!events) {
- __ findpropstrict(h,"[package]::gotoAndStop");
- __ pushbyte(h,framenr+1);
- __ callpropvoid(h,"[package]::gotoAndStop", 1);
- } else {
- char framename[80];
- sprintf(framename, "frame%d", framenr);
- __ getlocal_0(h); //this
- __ findpropstrict(h, "[package]flash.events::TextEvent");
- __ pushstring(h, "link");
- __ pushtrue(h);
- __ pushtrue(h);
- __ pushstring(h, framename);
- __ constructprop(h,"[package]flash.events::TextEvent", 4);
- __ callpropvoid(h,"[package]::dispatchEvent", 1);
- }
- } else if(oldaction && oldaction->op == ACTION__GETURL) {
- if(!events) {
- __ findpropstrict(h,"flash.net::navigateToURL");
- __ findpropstrict(h,"flash.net::URLRequest");
- // TODO: target _blank
- __ pushstring(h,oldaction->data); //url
- __ constructprop(h,"flash.net::URLRequest", 1);
- __ callpropvoid(h,"flash.net::navigateToURL", 1);
- } else {
- __ getlocal_0(h); //this
- __ findpropstrict(h, "[package]flash.events::TextEvent");
- __ pushstring(h, "link");
- __ pushtrue(h);
- __ pushtrue(h);
- __ pushstring(h,oldaction->data); //url
- __ constructprop(h,"[package]flash.events::TextEvent", 4);
- __ callpropvoid(h,"[package]::dispatchEvent", 1);
- }
- } else if(oldaction) {
- fprintf(stderr, "Warning: Couldn't translate button code of button %d to flash 9 abc action\n", id);
- }
- __ returnvoid(h);
- swf_ActionFree(oldaction);
- }
- if(tag->id == ST_SHOWFRAME) {
- if(f) {
- __ returnvoid(f);
- f = 0;
- }
- frame++;
- }
- tag = tag->next;
- }
- if(f) {
- __ returnvoid(f);
- }
- }
- __ returnvoid(c);
-
- tag = swf->firstTag;
- while(tag) {
- if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
- char buttonname[80];
- sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
- multiname_t*s = multiname_fromstring(buttonname);
- //abc_class_slot(cls, multiname_fromstring(buttonname), s);
- abc_class_slot(cls, multiname_fromstring(buttonname),
- multiname_fromstring("flash.display::SimpleButton"));
- }
- tag = tag->next;
- }
-
-
- abc_script_t*s = abc_initscript(file);
- c = s->method->body;
- c->old.max_stack = 2;
- c->old.local_count = 1;
- c->old.init_scope_depth = 1;
- c->old.max_scope_depth = 9;
-
- __ getlocal_0(c);
- __ pushscope(c);
- __ getscopeobject(c, 0);
- __ getlex(c,"::Object");
- __ pushscope(c);
- __ getlex(c,"flash.events::EventDispatcher");
- __ pushscope(c);
- __ getlex(c,"flash.display::DisplayObject");
- __ pushscope(c);
- __ getlex(c,"flash.display::InteractiveObject");
- __ pushscope(c);
- __ getlex(c,"flash.display::DisplayObjectContainer");
- __ pushscope(c);
- __ getlex(c,"flash.display::Sprite");
- __ pushscope(c);
- __ getlex(c,"flash.display::MovieClip");
- __ pushscope(c);
- __ getlex(c,"flash.display::MovieClip");
- __ newclass(c,cls);
- __ popscope(c);
- __ popscope(c);
- __ popscope(c);
- __ popscope(c);
- __ popscope(c);
- __ popscope(c);
- __ popscope(c);
- __ initproperty(c,"rfx::MainTimeline");
- __ returnvoid(c);
-
- //abc_method_body_addClassTrait(c, "rfx:MainTimeline", 1, cls);
- multiname_t*classname = multiname_fromstring("rfx::MainTimeline");
- abc_initscript_addClassTrait(s, classname, cls);
- multiname_destroy(classname);
-
- swf_WriteABC(abctag, file);
-}
-
-TAG*swf_AddAS3FontDefine(TAG*tag, U16 id, char*fontname)
-{
- tag = swf_InsertTag(tag, ST_DOABC);
- abc_file_t*file = abc_file_new();
-
- //abc_class_t*cls = abc_class_new2(file, fontname, "flash.display::MovieClip");
- //abc_class_slot(cls, multiname_fromstring(fontname), multiname_fromstring("flash.text::Font"));
-
- abc_class_t*cls = abc_class_new2(file, fontname, "flash.text::Font");
-
- abc_script_t*s = abc_initscript(file);
- code_t*c = s->method->body->code;
- c = abc_getlocal_0(c);
- c = abc_pushscope(c);
- c = abc_getscopeobject(c, 0);
- c = abc_getlex(c,"flash.text::Font");
- c = abc_pushscope(c);
- c = abc_getlex(c,"flash.text::Font");
- c = abc_newclass(c,cls);
- c = abc_popscope(c);
- c = abc_initproperty(c, fontname);
- c = abc_returnvoid(c);
- s->method->body->code = c;
-
- abc_initscript_addClassTrait(s, multiname_fromstring(fontname), cls);
- swf_WriteABC(tag, file);
-
- tag = swf_InsertTag(tag, ST_SYMBOLCLASS);
- swf_SetU16(tag, 1);
- swf_SetU16(tag, id);
- swf_SetString(tag, fontname);
-
- return tag;
-}
-
-
git.asbjorn.biz / swftools.git / blobdiff