search for: swfdec_as_value_set_numb

...global ones diff --git a/libswfdec/swfdec_as_math.c b/libswfdec/swfdec_as_math.c index ddd6987..ad2468a 100644 --- a/libswfdec/swfdec_as_math.c +++ b/libswfdec/swfdec_as_math.c @@ -136,21 +136,21 @@ swfdec_as_math_init_context (SwfdecAsCon /* set the right properties on the Math object */ SWFDEC_AS_VALUE_SET_NUMBER (&val, G_E); - swfdec_as_object_set_variable (context->global, SWFDEC_AS_STR_E, &val); + swfdec_as_object_set_variable (math, SWFDEC_AS_STR_E, &val); SWFDEC_AS_VALUE_SET_NUMBER (&val, G_LN10); - swfdec_as_object_set_variable (context->global, SWFDEC_AS_STR_LN10, &v...

...if (!proto) diff --git a/libswfdec/swfdec_as_math.c b/libswfdec/swfdec_as_math.c index 126e7be..5f6a24d 100644 --- a/libswfdec/swfdec_as_math.c +++ b/libswfdec/swfdec_as_math.c @@ -144,21 +144,37 @@ swfdec_as_math_init_context (SwfdecAsCon /* set the right properties on the Math object */ SWFDEC_AS_VALUE_SET_NUMBER (&val, G_E); - swfdec_as_object_set_variable (math, SWFDEC_AS_STR_E, &val); + swfdec_as_object_set_variable_and_flags (math, SWFDEC_AS_STR_E, &val, + SWFDEC_AS_VARIABLE_HIDDEN | SWFDEC_AS_VARIABLE_PERMANENT | + SWFDEC_AS_VARIABLE_CONSTANT); SWFDEC_AS_VALUE_SET_NUMBER (&...

...s = value; } static void @@ -619,8 +619,7 @@ swfdec_text_field_movie_get_textColor (SwfdecAsContext *cx, SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, ""); - swfdec_as_object_get_variable (SWFDEC_AS_OBJECT (text->format_new), - SWFDEC_AS_STR_color, ret); + SWFDEC_AS_VALUE_SET_NUMBER (ret, text->format_new->color); } // This doesn't work the same way as TextFormat's color setting @@ -631,18 +630,16 @@ swfdec_text_field_movie_set_textColor (SwfdecAsContext *cx, { SwfdecTextFieldMovie *text; int value; - SwfdecAsValue val; SWFDEC_AS_CHECK (SWFDEC_...

...;/TITLE> SwfdecAsValueType SwfdecAsValue +SWFDEC_AS_VALUE_SET_UNDEFINED +SWFDEC_AS_VALUE_GET_BOOLEAN swfdec_as_value_to_boolean -swfdec_as_value_to_integer +SWFDEC_AS_VALUE_SET_BOOLEAN +SWFDEC_AS_VALUE_GET_NUMBER swfdec_as_value_to_number +swfdec_as_value_to_integer +SWFDEC_AS_VALUE_SET_INT +SWFDEC_AS_VALUE_SET_NUMBER +SWFDEC_AS_VALUE_GET_STRING +swfdec_as_value_to_string +SWFDEC_AS_VALUE_SET_STRING +SWFDEC_AS_VALUE_SET_NULL +SWFDEC_AS_VALUE_GET_OBJECT swfdec_as_value_to_object +SWFDEC_AS_VALUE_SET_OBJECT swfdec_as_value_to_primitive -swfdec_as_value_to_string +swfdec_as_double_to_string +swfdec_as_str_conca...

...ec_text_field_movie_as.c +++ b/libswfdec/swfdec_text_field_movie_as.c @@ -424,7 +424,7 @@ swfdec_text_field_movie_get_textHeight (SwfdecAsContext *cx, SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, ""); swfdec_text_field_movie_get_text_size (text, NULL, &height); - SWFDEC_AS_VALUE_SET_NUMBER (ret, height); + SWFDEC_AS_VALUE_SET_NUMBER (ret, SWFDEC_TWIPS_TO_DOUBLE (height)); } static void @@ -438,7 +438,7 @@ swfdec_text_field_movie_get_textWidth (SwfdecAsContext *cx, SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, ""); swfdec_text_field_movie_get_text_...

...ovie_as.c index 70ce222..0b73b2b 100644 --- a/libswfdec/swfdec_text_field_movie_as.c +++ b/libswfdec/swfdec_text_field_movie_as.c @@ -486,7 +486,10 @@ swfdec_text_field_movie_get_backgroundColor (SwfdecAsContext *cx, SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, ""); - SWFDEC_AS_VALUE_SET_NUMBER (ret, text->background_color); + SWFDEC_AS_VALUE_SET_NUMBER (ret, + SWFDEC_COLOR_R (text->background_color) << 16 | + SWFDEC_COLOR_G (text->background_color) << 8 | + SWFDEC_COLOR_B (text->background_color)); } static void @@ -546,7 +549,11 @@ swfdec_te...

...fdec_as_math_ ## name (SwfdecAsContext *cx, SwfdecAsObject *object, \ + guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) \ { \ - double d = swfdec_as_value_to_number (object->context, &argv[0]); \ + double d = swfdec_as_value_to_number (cx, &argv[0]); \ \ d = name (d); \ SWFDEC_AS_VALUE_SET_NUMBER (ret, d); \ @@ -54,52 +55,58 @@ MATH_FUN (sqrt) MATH_FUN (tan) static void -swfdec_as_math_abs (SwfdecAsObject *object, guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) +swfdec_as_math_abs (SwfdecAsContext *cx, SwfdecAsObject *object, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *r...

...@ swfdec_text_field_movie_get_bottomScroll (SwfdecAsContext *cx, SwfdecAsValue *ret) { SwfdecTextFieldMovie *text; - int last; SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, ""); - swfdec_text_field_movie_get_scroll_info (text, &last, NULL, NULL, NULL); - SWFDEC_AS_VALUE_SET_NUMBER (ret, last); + SWFDEC_AS_VALUE_SET_NUMBER (ret, text->scroll_bottom); } static void @@ -550,7 +552,11 @@ swfdec_text_field_movie_do_set_hscroll (SwfdecAsContext *cx, SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, "i", &value); - swfdec_text_field_movie_set...

...movie_as.c index bef2ca6..86ca221 100644 --- a/libswfdec/swfdec_text_field_movie_as.c +++ b/libswfdec/swfdec_text_field_movie_as.c @@ -481,7 +481,7 @@ swfdec_text_field_movie_get_backgroundColor (SwfdecAsContext *cx, SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, ""); - SWFDEC_AS_VALUE_SET_NUMBER (ret, text->background_color); + SWFDEC_AS_VALUE_SET_NUMBER (ret, text->background_color & 0xffffff); } static void @@ -495,7 +495,8 @@ swfdec_text_field_movie_set_backgroundColor (SwfdecAsContext *cx, SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, "i", &a...

...swfdec_load_object_loader_target_parse (SwfdecLoaderTarget *target, SwfdecLoader *loader) { - SwfdecAsValue val; SwfdecLoadObject *load_object = SWFDEC_LOAD_OBJECT (target); + SwfdecAsValue val; + glong size; - SWFDEC_AS_VALUE_SET_INT (&val, swfdec_loader_get_loaded (loader)); + SWFDEC_AS_VALUE_SET_NUMBER (&val, swfdec_loader_get_loaded (loader)); swfdec_as_object_set_variable_and_flags (load_object->target, SWFDEC_AS_STR__bytesLoaded, &val, SWFDEC_AS_VARIABLE_HIDDEN); - SWFDEC_AS_VALUE_SET_INT (&val, swfdec_loader_get_size (loader)); + size = swfdec_loader_get_size (l...

...conds * 1000; } // set and get function helpers @@ -489,9 +489,9 @@ swfdec_as_date_getUTCMilliseconds (Swfde milliseconds = swfdec_as_date_get_milliseconds_utc (date); if (milliseconds >= 0 || (milliseconds % 1000 == 0)) { - SWFDEC_AS_VALUE_SET_INT (ret, milliseconds % 1000); + SWFDEC_AS_VALUE_SET_NUMBER (ret, milliseconds % 1000); } else { - SWFDEC_AS_VALUE_SET_INT (ret, 1000 + milliseconds % 1000); + SWFDEC_AS_VALUE_SET_NUMBER (ret, 1000 + milliseconds % 1000); } } @@ -894,7 +894,7 @@ swfdec_as_date_UTC (SwfdecAsContext *cx, brokentime.tm_year = year; } - milliseconds...

...8a..dff7c7d 100644 --- a/libswfdec/swfdec_as_math.c +++ b/libswfdec/swfdec_as_math.c @@ -50,7 +50,6 @@ MATH_FUN (cos) MATH_FUN (exp) MATH_FUN (floor) MATH_FUN (log) -MATH_FUN (round) MATH_FUN (sin) MATH_FUN (sqrt) MATH_FUN (tan) @@ -110,6 +109,15 @@ swfdec_as_math_random (SwfdecAsContext * SWFDEC_AS_VALUE_SET_NUMBER (ret, g_rand_double (cx->rand)); } +static void +swfdec_as_math_round (SwfdecAsContext *cx, SwfdecAsObject *object, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) +{ + double d = swfdec_as_value_to_number (cx, &argv[0]); + + SWFDEC_AS_VALUE_SET_NUMBER (ret, trunc (d + 0.5)...

...movie_asprops.c b/libswfdec/swfdec_movie_asprops.c index 2288b0a..e9fef7d 100644 --- a/libswfdec/swfdec_movie_asprops.c +++ b/libswfdec/swfdec_movie_asprops.c @@ -133,21 +133,19 @@ mc_yscale_set (SwfdecMovie *movie, const static void mc_currentframe (SwfdecMovie *movie, SwfdecAsValue *rval) { - SWFDEC_AS_VALUE_SET_NUMBER (rval, movie->frame + 1); + g_assert (SWFDEC_IS_SPRITE_MOVIE (movie)); + SWFDEC_AS_VALUE_SET_NUMBER (rval, SWFDEC_SPRITE_MOVIE (movie)->frame); } static void mc_framesloaded (SwfdecMovie *mov, SwfdecAsValue *rval) { - /* only root movies can be partially loaded */ - if (SWFDEC_IS_...

...)->type = SWFDEC_TYPE_AS_BOOLEAN; \ + (__val)->value.boolean = b; \ } G_STMT_END #define SWFDEC_AS_VALUE_IS_NUMBER(val) ((val)->type == SWFDEC_TYPE_AS_NUMBER) #define SWFDEC_AS_VALUE_GET_NUMBER(val) (g_assert ((val)->type == SWFDEC_TYPE_AS_NUMBER), (val)->value.number) #define SWFDEC_AS_VALUE_SET_NUMBER(val,d) G_STMT_START { \ - (val)->type = SWFDEC_TYPE_AS_NUMBER; \ - (val)->value.number = d; \ + SwfdecAsValue *__val = (val); \ + (__val)->type = SWFDEC_TYPE_AS_NUMBER; \ + (__val)->value.number = d; \ } G_STMT_END #define SWFDEC_AS_VALUE_IS_STRING(val) ((val)->type == SWF...

...ie_asprops.c +++ b/libswfdec/swfdec_movie_asprops.c @@ -327,7 +327,7 @@ mc_xmouse_get (SwfdecMovie *movie, Swfde double x, y; swfdec_movie_get_mouse (movie, &x, &y); - x = rint (x * SWFDEC_TWIPS_SCALE_FACTOR) / SWFDEC_TWIPS_SCALE_FACTOR; + x = SWFDEC_TWIPS_TO_DOUBLE (rint (x)); SWFDEC_AS_VALUE_SET_NUMBER (rval, x); } @@ -337,7 +337,7 @@ mc_ymouse_get (SwfdecMovie *movie, Swfde double x, y; swfdec_movie_get_mouse (movie, &x, &y); - y = rint (y * SWFDEC_TWIPS_SCALE_FACTOR) / SWFDEC_TWIPS_SCALE_FACTOR; + y = SWFDEC_TWIPS_TO_DOUBLE (rint (y)); SWFDEC_AS_VALUE_SET_NUMBER (rval,...

...SWFDEC_AS_VALUE_SET_OBJECT (&val, context->Function); - swfdec_as_object_set_variable (array, SWFDEC_AS_STR_constructor, &val); + swfdec_as_object_set_variable_and_flags (array, SWFDEC_AS_STR_constructor, + &val, SWFDEC_AS_VARIABLE_HIDDEN | SWFDEC_AS_VARIABLE_PERMANENT); SWFDEC_AS_VALUE_SET_NUMBER (&val, ARRAY_SORT_OPTION_CASEINSENSITIVE); swfdec_as_object_set_variable (array, SWFDEC_AS_STR_CASEINSENSITIVE, &val); SWFDEC_AS_VALUE_SET_NUMBER (&val, ARRAY_SORT_OPTION_DESCENDING); @@ -1104,7 +1099,8 @@ swfdec_as_array_init_context (SwfdecAsCo /* set the right properties...

..., context->Function); - swfdec_as_object_set_variable (number, SWFDEC_AS_STR_constructor, &val); + swfdec_as_object_set_variable_and_flags (number, SWFDEC_AS_STR_constructor, + &val, SWFDEC_AS_VARIABLE_HIDDEN | SWFDEC_AS_VARIABLE_PERMANENT | + SWFDEC_AS_VARIABLE_CONSTANT); SWFDEC_AS_VALUE_SET_NUMBER (&val, NAN); swfdec_as_object_set_variable (number, SWFDEC_AS_STR_NaN, &val); SWFDEC_AS_VALUE_SET_NUMBER (&val, G_MAXDOUBLE); @@ -123,9 +127,11 @@ swfdec_as_number_init_context (SwfdecAsC swfdec_as_object_set_variable (number, SWFDEC_AS_STR_POSITIVE_INFINITY, &val); /*...

...4 2007 +0200 implement Less and Equals diff --git a/libswfdec/swfdec_as_interpret.c b/libswfdec/swfdec_as_interpret.c index dfcefb1..7ea1f82 100644 --- a/libswfdec/swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -1016,18 +1016,14 @@ swfdec_action_random_number (SwfdecAsCon SWFDEC_AS_VALUE_SET_NUMBER (val, g_rand_int_range (cx->rand, 0, max)); } -#if 0 static void swfdec_action_old_compare (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) { - jsval rval, lval; double l, r; - void cond; + gboolean cond; - rval = cx->fp->sp[-1]; - lval = cx->fp->s...

...swfdec_as_context.c index e5660a0..61de9b5 100644 --- a/libswfdec/swfdec_as_context.c +++ b/libswfdec/swfdec_as_context.c @@ -1227,7 +1227,11 @@ swfdec_as_context_parseInt (SwfdecAsCont return; } - SWFDEC_AS_VALUE_SET_INT (retval, i); + if (i > G_MAXINT32 || i < G_MININT32) { + SWFDEC_AS_VALUE_SET_NUMBER (retval, i); + } else { + SWFDEC_AS_VALUE_SET_INT (retval, i); + } } SWFDEC_AS_NATIVE (100, 3, swfdec_as_context_parseFloat)

...p;argv[0]); if (i < 0) { SWFDEC_AS_VALUE_SET_STRING (ret, SWFDEC_AS_STR_EMPTY); @@ -177,6 +186,9 @@ swfdec_as_string_charCodeAt (SwfdecAsCon const char *s; gunichar c; + if (argc < 1) + return; + i = swfdec_as_value_to_integer (cx, &argv[0]); if (i < 0) { SWFDEC_AS_VALUE_SET_NUMBER (ret, NAN); @@ -289,9 +301,10 @@ void swfdec_as_string_toString (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) { - SwfdecAsString *string = SWFDEC_AS_STRING (object); + if (!SWFDEC_IS_AS_STRING (object)) + return; - SWFDEC_AS_VALU...