search for: swfdec_movie_set_vari

Use swfdec_as_object_decode for parsing variables passed in webpages to flash. swfdec_movie_set_variables (and friends) can't stuff like an url being passed in the value of a variable and other things. Pages which where broken included the flash at the upper right corner of http://www.kanal5.se and the presentation of houses for sale at http://www.svenskfast.se. Solution: use swfdec_as_object...

...AIRO_CFLAGS) -urlencode_LDFLAGS = $(SWFDEC_LIBS) $(CAIRO_LIBS) - commit b72f91ccfcdd70cc3f9b6edbc4b59cce97263990 Author: Andreas Henriksson <andreas at fatal.se> Date: Mon Nov 12 20:55:41 2007 +0100 Use swfdec_as_object_decode for parsing variables passed in webpages to flash. swfdec_movie_set_variables (and friends) can't stuff like an url being passed in the value of a variable and other things. Pages which where broken included the flash at the upper right corner of http://www.kanal5.se and the presentation of houses for sale at http://www.svenskfast.se. Soluti...

libswfdec/swfdec_movie.c | 3 +++ 1 files changed, 3 insertions(+) New commits: diff-tree 774031e0bb34710e971ab143aac62300907486d3 (from a6c380467a9cb20fd2d151d74603f1de5637cabf) Author: Benjamin Otte <otte at gnome.org> Date: Wed Jun 13 16:34:43 2007 +0200 fix matrix calculation - 3 lines got lost in the reorg diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c

...Otte <otte at gnome.org> Date: Thu Jul 12 15:16:34 2007 +0200 return the path of the movie as debug string diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index ce3abc2..7ae2a67 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -837,6 +837,14 @@ swfdec_movie_set_variable (SwfdecAsObjec SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->set (object, variable, val); } +static char * +swfdec_movie_get_debug (SwfdecAsObject *object) +{ + SwfdecMovie *movie = SWFDEC_MOVIE (object); + + return swfdec_movie_get_path (movie); +} + static gboolean swfdec_m...

...gnome.org> Date: Wed Jan 2 14:41:03 2008 +0100 include children movieclips in a movie's foreach function diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index f06a289..400ca2e 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -1227,6 +1227,27 @@ swfdec_movie_set_variable (SwfdecAsObject *object, const char *variable, SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->set (object, variable, val, flags); } +static gboolean +swfdec_movie_foreach_variable (SwfdecAsObject *object, SwfdecAsVariableForeach func, gpointer data) +{ + SwfdecMovie *movie = SWFD...

...gt;set (with->object, variable, val, flags); } static void diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 3bac79f..0ddb8ff 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -875,7 +875,7 @@ swfdec_movie_get_variable (SwfdecAsObjec static void swfdec_movie_set_variable (SwfdecAsObject *object, const char *variable, - const SwfdecAsValue *val) + const SwfdecAsValue *val, guint flags) { SwfdecMovie *movie = SWFDEC_MOVIE (object); @@ -883,7 +883,7 @@ swfdec_movie_set_variable (SwfdecAsObjec return; if (swfdec_movie_set_asprop (movie, variabl...

Missed you on #swfdec, so I'll throw you this mail instead. Please be critical to these patches as it's way to late for me to write code and I haven't really double-checked they are correct as my brain went to sleep hours ago, but they seem to work in my minimal testing. ;) Ran into this use-after-free... http://www.fatal.se/tmp/swf/swfdec-use-after-free.diff (attached). While

...ie = swfdec_movie_new (player, depth - 16384, NULL, NULL, name); movie->name = SWFDEC_AS_STR_EMPTY; - swfdec_swf_instance_new (SWFDEC_SPRITE_MOVIE (movie), loader); + swfdec_swf_instance_new (SWFDEC_SPRITE_MOVIE (movie), loader, variables); g_object_unref (loader); - if (variables) - swfdec_movie_set_variables (movie, variables); return movie; } diff --git a/libswfdec/swfdec_swf_instance.c b/libswfdec/swfdec_swf_instance.c index 7f82971..df6b252 100644 --- a/libswfdec/swfdec_swf_instance.c +++ b/libswfdec/swfdec_swf_instance.c @@ -72,6 +72,23 @@ swfdec_swf_instance_loader_target_image } s...

...ring btw: if someone has better names than get_string/give_string, tell me. I couldn't come up with any. diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index c0bf0df..dff211f 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -466,8 +466,7 @@ swfdec_movie_set_variables (SwfdecMovie g_free (value); break; } - asname = swfdec_as_context_get_string (as->context, name); - g_free (name); + asname = swfdec_as_context_give_string (as->context, name); SWFDEC_AS_VALUE_SET_STRING (&val, swfdec_as_context_get_string (as->c...

...ner *listener = iter->data; + + if (listener->name != name && + (SWFDEC_AS_OBJECT (movie)->context->version >= 7 || + !swfdec_str_case_equal (listener->name, name))) + continue; + + listener->function (listener->object, name, val); + } +} + static void swfdec_movie_set_variable (SwfdecAsObject *object, const char *variable, const SwfdecAsValue *val, guint flags) @@ -1054,8 +1126,12 @@ swfdec_movie_set_variable (SwfdecAsObject *object, const char *variable, if (movie->state == SWFDEC_MOVIE_STATE_DESTROYED) return; + if (swfdec_movie_set_asprop (mo...

..._class->dispose = swfdec_movie_dispose; + object_class->get_property = swfdec_movie_get_property; + object_class->set_property = swfdec_movie_set_property; asobject_class->mark = swfdec_movie_mark; asobject_class->get = swfdec_movie_get_variable; asobject_class->set = swfdec_movie_set_variable; asobject_class->debug = swfdec_movie_get_debug; + g_object_class_install_property (object_class, PROP_DEPTH, + g_param_spec_int ("depth", "depth", "z order inside the parent", + G_MININT, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); +...

..._open (SwfdecLoaderTarget *target, SwfdecLoader *loader) +{ + SwfdecResource *instance = SWFDEC_RESOURCE (target); + const char *query; + + query = swfdec_url_get_query (swfdec_loader_get_url (loader)); + if (query) { + SWFDEC_INFO ("set url query movie variables: %s", query); + swfdec_movie_set_variables (SWFDEC_MOVIE (instance->movie), query); + } + if (instance->variables) { + SWFDEC_INFO ("set manual movie variables: %s", instance->variables); + swfdec_movie_set_variables (SWFDEC_MOVIE (instance->movie), instance->variables); + } +} + +static void +swfdec_r...

...+ + swfdec_resource_emit_signal (resource, SWFDEC_AS_STR_onLoadError, FALSE, vals, 2); } static void @@ -144,7 +173,8 @@ swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *lo SWFDEC_INFO ("set manual movie variables: %s", instance->variables); swfdec_movie_set_variables (SWFDEC_MOVIE (instance->movie), instance->variables); } - swfdec_resource_emit_signal (instance, SWFDEC_AS_STR_onLoadStart, NULL, 0); + swfdec_resource_emit_signal (instance, SWFDEC_AS_STR_onLoadStart, FALSE, NULL, 0); + instance->state = SWFDEC_RESOURCE_OPENED; } static vo...

...otte at gnome.org> Date: Wed Aug 22 21:09:35 2007 +0200 add swfdec_movie_rect_global_to_local/local_to_global() diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 96a7af1..eb1e2e5 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -476,7 +476,7 @@ swfdec_movie_set_variables (SwfdecMovie /* NB: coordinates are in movie's coordiante system. Use swfdec_movie_get_mouse * if you have global coordinates */ -static gboolean +gboolean swfdec_movie_mouse_in (SwfdecMovie *movie, double x, double y) { SwfdecMovieClass *klass; @@ -490,14 +490,42 @@ swfdec_movi...

...t_name (condition); if (name == NULL || - !swfdec_scriptable_can_execute (SWFDEC_SCRIPTABLE (movie), name)) + !swfdec_as_object_has_function (SWFDEC_AS_OBJECT (movie), name)) return FALSE; } @@ -405,6 +453,52 @@ swfdec_movie_queue_script (SwfdecMovie * return TRUE; } +/** + * swfdec_movie_set_variables: + * @script: a #SwfdecMovie + * @variables: variables to set on @movie in application-x-www-form-urlencoded + * format + * + * Verifies @variables to be encoded correctly and sets them as string + * properties on the given @movie. + **/ +void +swfdec_movie_set_variables (Swfdec...

...c/swfdec_player.c @@ -968,7 +968,6 @@ swfdec_player_add_level_from_loader (Swf swfdec_player_remove_level (player, depth); movie = swfdec_movie_new_for_player (player, depth); root = SWFDEC_ROOT_MOVIE (movie); - root->player = player; root->loader = loader; if (variables) swfdec_movie_set_variables (movie, variables); diff --git a/libswfdec/swfdec_root_movie.c b/libswfdec/swfdec_root_movie.c index 8b22055..1fcba46 100644 --- a/libswfdec/swfdec_root_movie.c +++ b/libswfdec/swfdec_root_movie.c @@ -47,7 +47,7 @@ G_DEFINE_TYPE_WITH_CODE (SwfdecRootMovie static SwfdecPlayer * swfdec_root_mo...

...} + static void swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *loader) { @@ -119,6 +147,7 @@ swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *lo SWFDEC_INFO ("set manual movie variables: %s", instance->variables); swfdec_movie_set_variables (SWFDEC_MOVIE (instance->movie), instance->variables); } + swfdec_resource_emit_signal (instance, SWFDEC_AS_STR_onLoadStart, NULL, 0); } static void @@ -126,6 +155,7 @@ swfdec_resource_loader_target_parse (SwfdecLoaderTarget *target, SwfdecLoader *l { SwfdecResource *instance...

...; + swfdec_swf_instance_new (SWFDEC_SPRITE_MOVIE (movie), loader, NULL); + g_object_unref (loader); } char * diff --git a/libswfdec/swfdec_movie.h b/libswfdec/swfdec_movie.h index 3b41d2f..7848d52 100644 --- a/libswfdec/swfdec_movie.h +++ b/libswfdec/swfdec_movie.h @@ -236,14 +236,12 @@ void swfdec_movie_set_variables (SwfdecMovie * movie, const char * variables); void swfdec_movie_load_variables (SwfdecMovie * movie, const char * url, - const char * target, - SwfdecLoaderRequest request); + SwfdecLoaderRequest request, + SwfdecBuffer * data); void swfdec_mo...

...gt;set (with->object, variable, val, flags); } static void diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 3bac79f..0ddb8ff 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -875,7 +875,7 @@ swfdec_movie_get_variable (SwfdecAsObjec static void swfdec_movie_set_variable (SwfdecAsObject *object, const char *variable, - const SwfdecAsValue *val) + const SwfdecAsValue *val, guint flags) { SwfdecMovie *movie = SWFDEC_MOVIE (object); @@ -883,7 +883,7 @@ swfdec_movie_set_variable (SwfdecAsObjec return; if (swfdec_movie_set_asprop (movie, variabl...

...*movie = SWFDEC_MOVIE (object); - if (movie->state == SWFDEC_MOVIE_STATE_DESTROYED) + movie = swfdec_movie_resolve (movie); + if (movie == NULL) return FALSE; if (SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->get (object, orig, variable, val, flags)) @@ -1166,7 +1194,8 @@ swfdec_movie_set_variable (SwfdecAsObject *object, const char *variable, { SwfdecMovie *movie = SWFDEC_MOVIE (object); - if (movie->state == SWFDEC_MOVIE_STATE_DESTROYED) + movie = swfdec_movie_resolve (movie); + if (movie == NULL) return; if (swfdec_movie_set_asprop (movie, variable, val)) diff --...