search for: guint

...eo.h | 6 +-- 54 files changed, 223 insertions(+), 223 deletions(-) New commits: diff-tree f516f0186bef8f00810f200034d63776bfab9271 (from 7f7d106034cd5fac344b12e3c93562a24ecd825f) Author: Benjamin Otte <otte@gnome.org> Date: Thu Mar 29 15:37:36 2007 +0200 s/unsigned int/guint/ to ease Python bindings diff --git a/libswfdec-gtk/swfdec_playback_alsa.c b/libswfdec-gtk/swfdec_playback_alsa.c index 8160f1c..b6a2f1a 100644 --- a/libswfdec-gtk/swfdec_playback_alsa.c +++ b/libswfdec-gtk/swfdec_playback_alsa.c @@ -120,7 +120,7 @@ try_write (Stream *stream) static void swfdec_...

...struct _SwfdecScript { /* must be first arg */ - JSFunction * fun; /* function script belongs to or NULL */ + gpointer fun; /* function script belongs to or NULL */ SwfdecBuffer * buffer; /* buffer holding the script */ - unsigned int refcount; /* reference count */ + guint refcount; /* reference count */ char * name; /* name identifying this script */ - unsigned int version; /* version of the script */ - unsigned int n_registers; /* number of registers */ - guint version; /* version of the script */ ++ guint version; /* version of the scrip...

...bswfdec/swfdec_as_array.c b/libswfdec/swfdec_as_array.c index e2071b6..b72e43b 100644 --- a/libswfdec/swfdec_as_array.c +++ b/libswfdec/swfdec_as_array.c @@ -160,9 +160,9 @@ swfdec_as_array_append (SwfdecAsArray *a /*** AS CODE ***/ static void -swfdec_as_array_toString (SwfdecAsObject *object, guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) +swfdec_as_array_toString (SwfdecAsContext *cx, SwfdecAsObject *object, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) { - SwfdecAsContext *cx = object->context; int i, length; const char *s, *str; SwfdecAsValue val; @@ -186,7...

....c b/libswfdec/swfdec_edittext.c index 9d12274..ed641e8 100644 --- a/libswfdec/swfdec_edittext.c +++ b/libswfdec/swfdec_edittext.c @@ -83,7 +83,7 @@ swfdec_edit_text_init (SwfdecEditText * } int -tag_func_define_edit_text (SwfdecSwfDecoder * s) +tag_func_define_edit_text (SwfdecSwfDecoder * s, guint tag) { SwfdecEditText *text; guint id; diff --git a/libswfdec/swfdec_edittext.h b/libswfdec/swfdec_edittext.h index 0bf5c27..be38c4d 100644 --- a/libswfdec/swfdec_edittext.h +++ b/libswfdec/swfdec_edittext.h @@ -77,7 +77,8 @@ struct _SwfdecEditTextClass GType swfdec_edit_text_get_type (...

...NULL); } -/* defines minimum and maximum versions for which we have seperate scripts */ -#define MINSCRIPTVERSION 3 -#define MAXSCRIPTVERSION 7 -#define EXTRACT_VERSION(v) MIN ((v) - MINSCRIPTVERSION, MAXSCRIPTVERSION - MINSCRIPTVERSION) - -typedef void (* SwfdecActionExec) (SwfdecAsContext *cx, guint action, const guint8 *data, guint len); -typedef struct { - const char * name; /* name identifying the action */ - char * (* print) (guint action, const guint8 *data, guint len); - int remove; /* values removed from stack or -1 for dynamic */ - int add; /* values added to the stack or...

...s(+), 95 deletions(-) New commits: commit 00ff0677e32eda7c9cd22d807c2ab71b7d92ebb6 Author: Pekka Lampila <pekka.lampila at iki.fi> Date: Thu Nov 8 12:09:18 2007 +0200 Add warnings flags: -Wswitch-enum -Wswitch-default Remove SwfdecAudioCodec and SwfdecVideoCodec enums and use guint with defines instead diff --git a/configure.ac b/configure.ac index fc48f5c..882a129 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl if we support them, we set them unconditionally AS_COMPILER_FLAG(-Wall, GLOBAL_CFLAGS="-Wall", GLOBAL_CFLAGS="") dnl I w...

...e Apr 24 10:57:17 2007 +0200 constify const functions (James A. Morrison) diff --git a/libswfdec/swfdec_bits.c b/libswfdec/swfdec_bits.c index 7077cdc..b74846e 100644 --- a/libswfdec/swfdec_bits.c +++ b/libswfdec/swfdec_bits.c @@ -125,7 +125,7 @@ swfdec_bits_init_data (SwfdecBits *bits, } guint -swfdec_bits_left (SwfdecBits *b) +swfdec_bits_left (const SwfdecBits *b) { if (b->ptr == NULL) return 0; @@ -179,7 +179,7 @@ swfdec_bits_getbits (SwfdecBits * b, gui } guint -swfdec_bits_peekbits (SwfdecBits * b, guint n) +swfdec_bits_peekbits (const SwfdecBits * b, guint n) {...

...d rename swfdec_bits_get_String_with_version() to it diff --git a/libswfdec/swfdec_as_interpret.c b/libswfdec/swfdec_as_interpret.c index b703847..130d920 100644 --- a/libswfdec/swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -326,7 +326,7 @@ swfdec_action_push (SwfdecAsContext *cx, guint action, const guint8 *data, guint switch (type) { case 0: /* string */ { - char *s = swfdec_bits_get_string_with_version (&bits, cx->version); + char *s = swfdec_bits_get_string (&bits, cx->version); if (s == NULL) return; SWFDEC_AS_VALUE_SET_STRING (sw...

...c_as_interpret.c b/libswfdec/swfdec_as_interpret.c index 60c4046..aab5f44 100644 --- a/libswfdec/swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -512,22 +512,18 @@ swfdec_action_push (SwfdecAsContext *cx, } } -#if 0 static void swfdec_action_get_variable (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) { const char *s; - s = swfdec_js_to_string (cx, cx->fp->sp[-1]); - if (s == NULL) - return JS_FALSE; - cx->fp->sp[-1] = swfdec_js_eval (cx, NULL, s); + s = swfdec_as_value_to_string (cx, swfdec_as_stack_peek (cx->frame->stack, 1)...

...quot;swfdec_as_context.h" +#include "swfdec_as_function.h" +#include "swfdec_debug.h" +#include "swfdec_player_internal.h" + +G_DEFINE_TYPE (SwfdecInterval, swfdec_interval, SWFDEC_TYPE_AS_OBJECT) + +static void +swfdec_interval_mark (SwfdecAsObject *object) +{ + guint i; + SwfdecInterval *interval = SWFDEC_INTERVAL (object); + + swfdec_as_object_mark (interval->object); + if (interval->fun_name) + swfdec_as_string_mark (interval->fun_name); + for (i = 0; i < interval->n_args; i++) { + swfdec_as_value_mark (&interval->args[i]); +...

...rgets"); + } + frame = swfdec_sprite_get_frame (SWFDEC_SPRITE_MOVIE (movie)->sprite, name); + } else { + /* FIXME: how do we treat undefined etc? */ + frame = swfdec_action_to_number (cx, val); + } + return frame; +} + static JSBool swfdec_action_goto_frame2 (JSContext *cx, guint action, const guint8 *data, guint len) { @@ -274,7 +295,6 @@ swfdec_action_goto_frame2 (JSContext *cx guint bias; gboolean play; jsval val; - int frame; SwfdecMovie *movie; swfdec_bits_init_data (&bits, data, len); @@ -288,24 +308,13 @@ swfdec_action_goto_frame2 (JSContext *c...

...et, Fifth Floor, + * Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gtk/gtk.h> +#include "libswfdec/swfdec_script.h" +#include "swfdec_out.h" +#include "swfedit_file.h" + +/* the stuff we look for */ +guint *add_trace = NULL; + +typedef gboolean ( *SwfeditTokenForeachFunc) (SwfeditToken *token, guint idx, + const char *name, SwfeditTokenType type, gconstpointer value, gpointer data); + +static gboolean +swfedit_token_foreach (SwfeditToken *token, SwfeditTokenForeachFunc func, + gpointer data)...

...{ SWFDEC_ERROR ("no valid target"); return NULL; } - return SWFDEC_MOVIE (target); + return SWFDEC_SPRITE_MOVIE (target); } /*** ALL THE ACTION IS HERE ***/ @@ -74,9 +74,9 @@ swfdec_action_get_target (SwfdecAsContex static void swfdec_action_stop (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) { - SwfdecMovie *movie = swfdec_action_get_target (cx); + SwfdecSpriteMovie *movie = swfdec_action_get_target (cx); if (movie) - movie->stopped = TRUE; + movie->playing = FALSE; else SWFDEC_ERROR ("no movie to stop"); } @@...

...terpret diff --git a/libswfdec/swfdec_script.c b/libswfdec/swfdec_script.c index dc8b2a5..95a5561 100644 --- a/libswfdec/swfdec_script.c +++ b/libswfdec/swfdec_script.c @@ -1418,7 +1418,8 @@ swfdec_action_init_object (JSContext *cx } static JSBool -swfdec_action_define_function (JSContext *cx, guint action, const guint8 *data, guint len) +swfdec_action_do_define_function (JSContext *cx, guint action, + const guint8 *data, guint len, gboolean v2) { const char *function_name; guint i, n_args, size; @@ -1426,7 +1427,8 @@ swfdec_action_define_function (JSContext JSFunction *fun; Sw...

...people mocking with bytecode. I guess the contents of this file reflects that. - So if you can do better, this file has just one public function: - swfdec_compile (). Feel free to reimplement it in a better way. - - *** END NOTE TO HACKERS ***/ - -/*** COMPILE STATE ***/ - -typedef struct { - guint bytecode; /* offset into bytecode where jump address goes */ - gboolean extended; /* if this is an extended jump */ - gboolean use_bytes; /* if TRUE, the offset is in bytes, otherwise it's in actions */ - guint offset; /* action to jump to */ -} Jump; - -typedef struct { - guint or...

...c_script.c +++ b/libswfdec/swfdec_script.c @@ -29,6 +29,7 @@ #include <string.h> #include "swfdec_decoder.h" +#include "swfdec_js.h" #include "swfdec_movie.h" #include "swfdec_root_movie.h" @@ -305,6 +306,18 @@ swfdec_action_push (JSContext *cx, guint return swfdec_bits_left (&bits) ? JS_TRUE : JS_FALSE; } +static JSBool +swfdec_action_get_variable (JSContext *cx, guint action, const guint8 *data, guint len) +{ + const char *s; + + s = swfdec_js_to_string (cx, cx->fp->sp[-1]); + if (s == NULL) + return JS_FALSE; + cx->f...

...@@ -32,32 +32,138 @@ /*** SwfdecDebuggerScript ***/ +typedef struct { + SwfdecConstantPool * constant_pool; /* current constant pool */ + GArray * commands; /* SwfdecDebuggerCommands parsed so far */ +} ScriptParser; + +static char * +swfdec_debugger_print_push (ScriptParser *parser, const guint8 *data, guint len) +{ + gboolean first = TRUE; + SwfdecBits bits; + GString *string = g_string_new ("Push"); + + swfdec_bits_init_data (&bits, data, len); + while (swfdec_bits_left (&bits)) { + guint type = swfdec_bits_get_u8 (&bits); + if (first) + g_string_ap...

...k_end; swfdec_as_frame_check_block (frame); diff --git a/libswfdec/swfdec_as_interpret.c b/libswfdec/swfdec_as_interpret.c index 3ab6fc0..cf41ff0 100644 --- a/libswfdec/swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -2543,6 +2543,7 @@ swfdec_action_throw (SwfdecAsContext *cx, guint action, const guint8 *data, } typedef struct { + int ref_count; const guint8 * start; gboolean catch; gboolean finally; @@ -2557,10 +2558,25 @@ typedef struct { } TryData; static void -swfdec_action_try_free_data (TryData *try_data) +swfdec_action_try_data_ref (gpointer data)...

...ibswfdec/swfdec_script.c index b34aba7..2dd36be 100644 --- a/libswfdec/swfdec_script.c +++ b/libswfdec/swfdec_script.c @@ -168,6 +168,13 @@ swfdec_script_foreach_internal (SwfdecBits *bits, SwfdecScriptForeachFunc func, return TRUE; } +static gboolean +validate_action (gconstpointer bytecode, guint action, const guint8 *data, guint len, gpointer scriptp) +{ + // TODO: get rid of this function + return TRUE; +} + /*** PUBLIC API ***/ gboolean @@ -230,9 +237,16 @@ swfdec_script_new_from_bits (SwfdecBits *bits, const char *name, guint version) * DefineFunction and friends override this...

...SWFShape_setRightFillStyle (shape, fill); + SWFShape_drawLineTo (shape, 50, 0); + SWFShape_drawLineTo (shape, 50, 50); + SWFShape_drawLineTo (shape, 0, 50); + SWFShape_drawLineTo (shape, 0, 0); + + SWFMovieClip_add (clip, (SWFBlock) shape); +} + +static void +modify_placement (SWFMovie movie, guint mod) +{ + SWFDisplayItem item; + SWFBlock clip, clip2; + + clip = (SWFBlock) newSWFMovieClip (); + add_rectangle ((SWFMovieClip) clip, 255, 0, 0); + SWFMovieClip_nextFrame ((SWFMovieClip) clip); + clip2 = (SWFBlock) newSWFMovieClip (); + add_rectangle ((SWFMovieClip) clip2, 0, 0, 255); + SW...