[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/07 20:31:11

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/actionscript.all: MovieClipLoader.as 

Log message:
        Use VM version, not relative movie one, to determine whether or not to 
use
        the _lockroot property.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5334&r2=1.5335
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.428&r2=1.429
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClipLoader.as?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5334
retrieving revision 1.5335
diff -u -b -r1.5334 -r1.5335
--- ChangeLog   7 Jan 2008 18:30:15 -0000       1.5334
+++ ChangeLog   7 Jan 2008 20:31:10 -0000       1.5335
@@ -1,5 +1,13 @@
 2008-01-07 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (get_root): use VM version, not
+         relative movie one, to determine whether or not to use
+         _lockroot.
+       * testsuite/actionscript.all/MovieClipLoader.as: _lockroot use
+         success.
+
+2008-01-07 Sandro Santilli <address@hidden>
+
        * server/array.cpp: in Array constructor take negative
          length as zero. Not correct yet, but at least saves some
          memory and makes Gnash a bit more robust (fixes bug #21975).

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -b -r1.428 -r1.429
--- server/sprite_instance.cpp  7 Jan 2008 11:44:10 -0000       1.428
+++ server/sprite_instance.cpp  7 Jan 2008 20:31:11 -0000       1.429
@@ -4167,7 +4167,8 @@
                // if the relative root has a parent we descend
                // to it unless SWF version of relRoot is >= 7
                // AND _lockroot is true
-               if ( relRoot->getSWFVersion() >= 7 )
+               //if ( relRoot->getSWFVersion() >= 7 )
+               if ( getVM().getSWFVersion() >= 7 )
                {
                        //string_table& st = _vm.getStringTable();
                        //as_value lockRoot = 
relRoot->getMember(st.find("_lockroot"));

Index: testsuite/actionscript.all/MovieClipLoader.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClipLoader.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/actionscript.all/MovieClipLoader.as       7 Jan 2008 16:47:25 
-0000       1.13
+++ testsuite/actionscript.all/MovieClipLoader.as       7 Jan 2008 20:31:11 
-0000       1.14
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClipLoader.as,v 1.13 2008/01/07 16:47:25 strk Exp $";
+rcsid="$Id: MovieClipLoader.as,v 1.14 2008/01/07 20:31:11 strk Exp $";
 
 #include "check.as"
 
@@ -145,6 +145,8 @@
                progCallbackTests = totalProgressCalls*testsPerProgressCallback;
                note("Number of onLoadProgress runs: "+totalProgressCalls+" - 
tests: "+progCallbackTests);
                if ( expected.failtotals ) {
+                       // this is failing due to vars.txt not being loaded
+                       // (how could it?)
                        xcheck_totals(expected.totals + progCallbackTests);
                } else {
                        check_totals(expected.totals + progCallbackTests);
@@ -244,9 +246,7 @@
                        note("---- Target's root is "+_root);
                        check_equals(_root, _level0);
                        _lockroot = true;
-                       // no idea why this fails, could be due to the 
assignment above doing unexpected things
-                       // (assigning to pre-rebound dangling char ref?)..
-                       xcheck_equals(_root, _level0.loadtarget);
+                       check_equals(_root, _level0.loadtarget);
                        note("---- After setting _lockroot to true, target's 
root is "+_root);
                        _lockroot = false;
                        check_equals(_root, _level0);