search for: swfdecasfunction

...rt; diff --git a/libswfdec/swfdec_as_function.c b/libswfdec/swfdec_as_function.c index c6a7c92..dd91fcc 100644 --- a/libswfdec/swfdec_as_function.c +++ b/libswfdec/swfdec_as_function.c @@ -27,63 +27,32 @@ #include "swfdec_as_stack.h" #include "swfdec_debug.h" -G_DEFINE_TYPE (SwfdecAsFunction, swfdec_as_function, SWFDEC_TYPE_AS_OBJECT) - -static void -swfdec_as_function_dispose (GObject *object) -{ - SwfdecAsFunction *function = SWFDEC_AS_FUNCTION (object); - - if (function->script) { - swfdec_script_unref (function->script); - function->script = NULL; - } - g_free (f...

...ill be this->prototype, but in special cases, this is not true. diff --git a/libswfdec/swfdec_as_function.c b/libswfdec/swfdec_as_function.c index ef60c0b..c64df5e 100644 --- a/libswfdec/swfdec_as_function.c +++ b/libswfdec/swfdec_as_function.c @@ -164,10 +164,10 @@ swfdec_as_function_call (SwfdecAsFunction *function, SwfdecAsObject *thisp, guin if (frame == NULL) return; if (thisp != NULL) { - swfdec_as_super_new (frame, thisp, FALSE); + swfdec_as_super_new (frame, thisp, thisp->prototype); } else { SWFDEC_FIXME ("does the super object really reference the function wh...

...- a/doc/swfdec-docs.sgml +++ b/doc/swfdec-docs.sgml @@ -27,5 +27,6 @@ <xi:include href="xml/SwfdecAsContext.xml"/> <xi:include href="xml/SwfdecAsObject.xml"/> <xi:include href="xml/SwfdecAsArray.xml"/> + <xi:include href="xml/SwfdecAsFunction.xml"/> </chapter> </book> diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index fd2f296..7773b37 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -296,4 +296,35 @@ SWFDEC_AS_ARRAY_CLASS SWFDEC_AS_ARRAY_GET_CLASS SWFDEC_IS_AS_ARRAY SWFDE...

...ot;), + SWFDEC_AS_CONSTANT_STRING ("constructor"), /* add more here */ NULL }; diff --git a/libswfdec/swfdec_as_types.h b/libswfdec/swfdec_as_types.h index b20b2e6..96fe3b4 100644 --- a/libswfdec/swfdec_as_types.h +++ b/libswfdec/swfdec_as_types.h @@ -42,7 +42,7 @@ typedef struct _SwfdecAsFunction SwfdecA typedef struct _SwfdecAsObject SwfdecAsObject; typedef struct _SwfdecAsStack SwfdecAsStack; typedef struct _SwfdecAsValue SwfdecAsValue; -typedef void (* SwfdecAsNative) (SwfdecAsContext *context, SwfdecAsObject *thisp, guint argc, SwfdecAsValue *argv, SwfdecAsValue *retval); +typedef vo...

...:36:43 2007 +0200 fix Super to look at the right variables diff --git a/libswfdec/swfdec_as_super.c b/libswfdec/swfdec_as_super.c index 5665e1a..6f5902f 100644 --- a/libswfdec/swfdec_as_super.c +++ b/libswfdec/swfdec_as_super.c @@ -35,20 +35,29 @@ static SwfdecAsFrame * swfdec_as_super_call (SwfdecAsFunction *function) { SwfdecAsSuper *super = SWFDEC_AS_SUPER (function); + SwfdecAsValue val; + SwfdecAsFunction *fun; SwfdecAsFunctionClass *klass; SwfdecAsFrame *frame; - if (super->constructor == NULL) { - SWFDEC_FIXME ("figure out what happens when super doesn't have a cons...

...var_object = SWFDEC_AS_OBJECT (frame); frame->argc = n_args; frame->argv = args; diff --git a/libswfdec/swfdec_as_function.h b/libswfdec/swfdec_as_function.h index 951911e..ddc92d9 100644 --- a/libswfdec/swfdec_as_function.h +++ b/libswfdec/swfdec_as_function.h @@ -44,8 +44,7 @@ struct _SwfdecAsFunctionClass { SwfdecAsObjectClass object_class; /* call this function: push a new frame onto the stack */ - void (* call) (SwfdecAsFunction * function, - SwfdecAsObject * thisp); + void (* call) (SwfdecAsFunction * function); }; GType swfdec_as_function_get_type (void); diff...

...(un)watch functions diff --git a/libswfdec/swfdec_as_object.c b/libswfdec/swfdec_as_object.c index 1fbf1d0..a331030 100644 --- a/libswfdec/swfdec_as_object.c +++ b/libswfdec/swfdec_as_object.c @@ -113,11 +113,14 @@ struct _SwfdecAsVariable { SwfdecAsValue value; /* value of property */ SwfdecAsFunction * get; /* getter set with swfdec_as_object_add_property */ SwfdecAsFunction * set; /* setter or %NULL */ - SwfdecAsFunction * watch; /* watcher or %NULL */ - SwfdecAsValue * watch_data; /* user data to watcher */ - gint8 watch_recurse; /* times the watch function has been called without...

...diff --git a/libswfdec/swfdec_as_function.c b/libswfdec/swfdec_as_function.c index 3e9b6dd..879ed9d 100644 --- a/libswfdec/swfdec_as_function.c +++ b/libswfdec/swfdec_as_function.c @@ -67,40 +67,31 @@ swfdec_as_function_init (SwfdecAsFunctio } /** - * swfdec_as_function_create: - * @context: a #SwfdecAsFunction - * @type: the type of function to create - * @size: size of @type + * swfdec_as_function_set_constructor: + * @fun: a #SwfdecAsFunction * - * Creates a new function. The function will be of @type. It will be added to - * @context and its prototype and constructor object will be set correctly. -...

...e "swfdec_interval.h" +/* FIXME: to avoid duplicate definitions */ +#undef SWFDEC_AS_NATIVE +#define SWFDEC_AS_NATIVE(x, y, func) /*** INTERVALS ***/ @@ -90,29 +95,80 @@ swfdec_player_clearInterval (SwfdecAsCon swfdec_interval_remove (player, id); } +/*** VARIOUS ***/ + +static SwfdecAsFunction * +swfdec_get_asnative (SwfdecAsContext *cx, guint x, guint y) +{ + guint i; + + for (i = 0; native_funcs[i].func != NULL; i++) { + if (native_funcs[i].x == x && native_funcs[i].y == y) { + return swfdec_as_native_function_new (cx, native_funcs[i].name, + native_funcs[i].func, 0...

...er.c @@ -29,11 +29,32 @@ #include "swfdec_as_function.h" #include "swfdec_debug.h" -G_DEFINE_TYPE (SwfdecAsSuper, swfdec_as_super, SWFDEC_TYPE_AS_OBJECT) +G_DEFINE_TYPE (SwfdecAsSuper, swfdec_as_super, SWFDEC_TYPE_AS_FUNCTION) + +static SwfdecAsFrame * +swfdec_as_super_call (SwfdecAsFunction *function) +{ + SwfdecAsSuper *super = SWFDEC_AS_SUPER (function); + SwfdecAsFunctionClass *klass; + SwfdecAsFrame *frame; + + if (super->constructor == NULL) { + SWFDEC_FIXME ("figure out what happens when super doesn't have a constructor"); + return NULL; + } + klass...

...1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "swfdec_as_function.h" +#include "swfdec_as_context.h" +#include "swfdec_as_frame.h" +#include "swfdec_as_stack.h" +#include "swfdec_debug.h" + +G_DEFINE_TYPE (SwfdecAsFunction, swfdec_as_function, SWFDEC_TYPE_AS_OBJECT) + +static void +swfdec_as_function_dispose (GObject *object) +{ + SwfdecAsFunction *function = SWFDEC_AS_FUNCTION (object); + + if (function->script) { + swfdec_script_unref (function->script); + function->script = NULL; + } + + G_OBJEC...

...SwfdecAsObject *object, SwfdecScript *script) g_object_unref (sec); } +void +swfdec_as_object_call_with_security (SwfdecAsObject *object, SwfdecSecurity *sec, + const char *name, guint argc, SwfdecAsValue *argv, SwfdecAsValue *return_value) +{ + static SwfdecAsValue tmp; /* ignored */ + SwfdecAsFunction *fun; + + g_return_if_fail (SWFDEC_IS_AS_OBJECT (object)); + g_return_if_fail (SWFDEC_IS_SECURITY (sec)); + g_return_if_fail (name != NULL); + g_return_if_fail (argc == 0 || argv != NULL); + g_return_if_fail (argc == 0 || argv != NULL); + + if (return_value) + SWFDEC_AS_VALUE_SET_UNDEFINED...

...action_trace (SwfdecAsContext *cx /* stack looks like this: [ function, this, arg1, arg2, ... ] */ /* stack must be at least 2 elements big */ static gboolean -swfdec_action_call (SwfdecAsContext *cx, guint n_args) +swfdec_action_call (SwfdecAsContext *cx, guint n_args, gboolean use_super) { SwfdecAsFunction *fun; SwfdecAsObject *thisp; @@ -591,6 +592,13 @@ swfdec_action_call (SwfdecAsContext *cx, swfdec_as_stack_pop_n (frame->stack, n_args); swfdec_as_function_call (fun, thisp, n_args, swfdec_as_stack_peek (frame->stack, 0), swfdec_as_stack_peek (frame->stack, 1)); + if (u...

...s_to_string (cx, fp->sp[-1]); - if (s == NULL) - return JS_FALSE; - if (!JS_ValueToECMAUint32 (cx, fp->sp[-3], &n_args)) - return JS_FALSE; - - if (!JS_ValueToObject (cx, fp->sp[-2], &object)) - return JS_FALSE; - if (object == NULL) + SwfdecAsValue *constructor; + SwfdecAsFunction *fun; + guint n_args; + const char *name; + + swfdec_as_stack_ensure_size (cx->frame->stack, 3); + name = swfdec_as_value_to_string (cx, swfdec_as_stack_pop (cx->frame->stack)); + + constructor = swfdec_as_stack_pop (cx->frame->stack); + n_args = swfdec_as_value_to_integer (...

...nternal.h b/libswfdec/swfdec_as_frame_internal.h index 44a87af..d50a9ce 100644 --- a/libswfdec/swfdec_as_frame_internal.h +++ b/libswfdec/swfdec_as_frame_internal.h @@ -33,7 +33,6 @@ struct _SwfdecAsFrame { SwfdecAsFrame * next; /* next frame (FIXME: keep a list in the context instead?) */ SwfdecAsFunction * function; /* function we're executing or NULL if toplevel */ - gboolean caller; /* this function can be used as arguments.caller */ SwfdecAsObject * thisp; /* this object in current frame or NULL if none */ SwfdecAsObject * super; /* super object in current frame or NULL if none */...

...t;</informalexample> + **/ void -swfdec_as_object_call (SwfdecAsObject *object, const char *name, guint argc, SwfdecAsValue *argv) +swfdec_as_object_call (SwfdecAsObject *object, const char *name, guint argc, + SwfdecAsValue *argv, SwfdecAsValue *return_value) { + SwfdecAsValue tmp; + SwfdecAsFunction *fun; + g_return_if_fail (SWFDEC_IS_AS_OBJECT (object)); g_return_if_fail (name != NULL); g_return_if_fail (argc == 0 || argv != NULL); + + if (return_value) + SWFDEC_AS_VALUE_SET_UNDEFINED (return_value); + swfdec_as_object_get (object, name, &tmp); + if (!SWFDEC_AS_VALUE_IS_OBJ...

...t argc, SwfdecAsObject *object_new; SwfdecAsArray *array_new; + if (object == NULL) + return; + length = swfdec_as_array_length (object); if (argc > 0) { @@ -1260,6 +1290,9 @@ swfdec_as_array_sort (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc, gint32 options; SwfdecAsFunction *custom_compare_func; + if (object == NULL) + return; + pos = 0; if (argc > 0 && !SWFDEC_AS_VALUE_IS_NUMBER (&argv[0])) { SwfdecAsFunction *fun; @@ -1290,6 +1323,9 @@ swfdec_as_array_sortOn (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc, const char **fie...

...-defined function have an implicit prototype property diff --git a/libswfdec/swfdec_as_function.c b/libswfdec/swfdec_as_function.c index 9256b31..c6a7c92 100644 --- a/libswfdec/swfdec_as_function.c +++ b/libswfdec/swfdec_as_function.c @@ -100,13 +100,22 @@ swfdec_as_function_do_create (SwfdecAsCo SwfdecAsFunction * swfdec_as_function_new (SwfdecAsScope *scope) { + SwfdecAsValue val; SwfdecAsFunction *fun; + SwfdecAsObject *proto; g_return_val_if_fail (SWFDEC_IS_AS_SCOPE (scope), NULL); fun = swfdec_as_function_do_create (SWFDEC_AS_OBJECT (scope)->context); if (fun == NULL) return...

http://bugs.freedesktop.org/show_bug.cgi?id=16206 Summary: Charts in Yahoo Finance crash swfdec Product: swfdec Version: git Platform: Other URL: http://finance.yahoo.com/echarts?s=%5EDJI#symbol=%5EDJI; range=1d OS/Version: All Status: NEW Severity: critical Priority: medium

...>context); } } else { var->value = *val; @@ -912,6 +925,43 @@ swfdec_as_object_set_constructor (Swfdec /*** AS CODE ***/ static void +swfdec_as_object_addProperty (SwfdecAsContext *cx, SwfdecAsObject *object, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *retval) +{ + SwfdecAsFunction *get, *set; + SwfdecAsVariable *var; + const char *name; + + SWFDEC_AS_VALUE_SET_BOOLEAN (retval, FALSE); + if (argc < 3) + return; + name = swfdec_as_value_to_string (cx, &argv[0]); + if (!SWFDEC_AS_VALUE_IS_OBJECT (&argv[1]) || + !SWFDEC_IS_AS_FUNCTION ((get = (SwfdecAsFu...