[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp testsu...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp testsu... |
Date: |
Thu, 27 Sep 2007 08:10:18 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/27 08:10:18
Modified files:
. : ChangeLog
server/vm : ActionExec.cpp
testsuite/misc-ming.all: action_execution_order_test8.c
testsuite/misc-swfc.all: movieclip_destruction_test1.sc
movieclip_destruction_test3.sc
Log message:
* server/vm/ActionExec.cpp (call operator): re-enable
opcode-guard but guard current target, not original
one. Keeps feed.swf and curveball.swf fixed and also
fixes the tests in our testsuite that where expected
to fail since disabling the opcode guard.
* testsuite/misc-ming.all/action_execution_order_test8.c,
testsuite/misc-swfc.all/movieclip_destruction_test1.sc,
testsuite/misc-swfc.all/movieclip_destruction_test3.sc:
success in the opcode-guard tests.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4437&r2=1.4438
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_test8.c?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test3.sc?cvsroot=gnash&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4437
retrieving revision 1.4438
diff -u -b -r1.4437 -r1.4438
--- ChangeLog 27 Sep 2007 07:58:32 -0000 1.4437
+++ ChangeLog 27 Sep 2007 08:10:17 -0000 1.4438
@@ -1,5 +1,17 @@
2007-09-27 Sandro Santilli <address@hidden>
+ * server/vm/ActionExec.cpp (call operator): re-enable
+ opcode-guard but guard current target, not original
+ one. Keeps feed.swf and curveball.swf fixed and also
+ fixes the tests in our testsuite that where expected
+ to fail since disabling the opcode guard.
+ * testsuite/misc-ming.all/action_execution_order_test8.c,
+ testsuite/misc-swfc.all/movieclip_destruction_test1.sc,
+ testsuite/misc-swfc.all/movieclip_destruction_test3.sc:
+ success in the opcode-guard tests.
+
+2007-09-27 Sandro Santilli <address@hidden>
+
* server/sprite_instance.cpp (get_member): make "_global"
a property (althought non-proper) of MovieClip. Fixes failures
in MovieClip.as.
Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/vm/ActionExec.cpp 27 Sep 2007 06:46:33 -0000 1.52
+++ server/vm/ActionExec.cpp 27 Sep 2007 08:10:17 -0000 1.53
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ActionExec.cpp,v 1.52 2007/09/27 06:46:33 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.53 2007/09/27 08:10:17 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -336,8 +336,14 @@
ash.execute((action_type)action_id, *this);
-#if 0 // See bugs: #20974, #21069, #20996.
- if ( _abortOnUnload && _original_target->isUnloaded() )
+#if 1 // See bugs: #20974, #21069, #20996.
+
+#if 0 // action_execution_order_test8.c shows that the opcode guard is not SWF
version based (TODO: automate it!)
+ if ( _abortOnUnload && _original_target->isUnloaded()
+ && VM::get().getSWFVersion() > 5 /* TODO: cache SWF version */ )
+#else // curveball.swf clearly shows that it is the *current* target, not the
*original* one that matters.
+ if ( _abortOnUnload && env.get_target()->isUnloaded() )
+#endif
{
std::stringstream ss;
ss << "Target of action_buffer (" <<
_original_target->getTarget()
Index: testsuite/misc-ming.all/action_execution_order_test8.c
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_test8.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-ming.all/action_execution_order_test8.c 26 Sep 2007
21:48:32 -0000 1.8
+++ testsuite/misc-ming.all/action_execution_order_test8.c 27 Sep 2007
08:10:17 -0000 1.9
@@ -136,7 +136,7 @@
/* Remove mc2 in frame 5 (from depth 3) */
SWFDisplayItem_remove(it2);
- xcheck_equals(mo, "_root.x", "200");
+ check_equals(mo, "_root.x", "200");
add_actions(mo, " _root.note('root frame '+_root._currentframe);");
add_actions(mo, " _root.totals(); stop(); ");
Index: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/misc-swfc.all/movieclip_destruction_test1.sc 26 Sep 2007
21:48:32 -0000 1.25
+++ testsuite/misc-swfc.all/movieclip_destruction_test1.sc 27 Sep 2007
08:10:18 -0000 1.26
@@ -154,7 +154,7 @@
.frame 6 // target frame
.action:
- xcheck_equals(_root.x, 0);
+ check_equals(_root.x, 0);
.end
Index: testsuite/misc-swfc.all/movieclip_destruction_test3.sc
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test3.sc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-swfc.all/movieclip_destruction_test3.sc 26 Sep 2007
21:48:32 -0000 1.5
+++ testsuite/misc-swfc.all/movieclip_destruction_test3.sc 27 Sep 2007
08:10:18 -0000 1.6
@@ -119,7 +119,7 @@
.frame 20
.action:
- xcheck_equals(_root.x, 300);
+ check_equals(_root.x, 300);
check_equals(typeof(nestedMovieClip), 'undefined');
check_equals(_root.as_order, "0+1+2+");
stop();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp testsu...,
Sandro Santilli <=