[Gnash-commit] gnash ChangeLog server/as_environment.cpp tests...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/24 23:54:22

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 
        testsuite/swfdec: PASSING 

Log message:
                * server/as_environment.cpp (find_target): use original target
                  for relative paths.
                * testsuite/swfdec/PASSING: succeed in settarget-relative-*.swf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4699&r2=1.4700
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4699
retrieving revision 1.4700
diff -u -b -r1.4699 -r1.4700
--- ChangeLog   24 Oct 2007 23:40:36 -0000      1.4699
+++ ChangeLog   24 Oct 2007 23:54:22 -0000      1.4700
@@ -1,5 +1,11 @@
 2007-10-24 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp (find_target): use original target
+         for relative paths.
+       * testsuite/swfdec/PASSING: succeed in settarget-relative-*.swf
+
+2007-10-24 Sandro Santilli <address@hidden>
+
        * server/vm/ASHandlers.cpp (CommonSetTarget):
          Reset to original target if argument doesn't correspond
          to a character.

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/as_environment.cpp   24 Oct 2007 07:58:14 -0000      1.100
+++ server/as_environment.cpp   24 Oct 2007 23:54:22 -0000      1.101
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.100 2007/10/24 07:58:14 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.101 2007/10/24 23:54:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -559,17 +559,16 @@
        log_msg(_("find_target(%s) called"), path.c_str());
 #endif
 
-    if (path.length() <= 0) {
+    if (path.empty())
+    {
 #ifdef DEBUG_TARGET_FINDING 
        log_msg(_("Returning m_target (empty path)"));
 #endif
-       return m_target;
+       return m_target; // or should we return the *original* path ?
     }
     
-    // we'd have returned m_target in this case
-    //assert(path.length() > 0);
-    
-    character* env = m_target;
+    // see swfdec's settarget-relative-*.swf
+    character* env = _original_target; // m_target;
     assert(env);
     
     const char*        p = path.c_str();

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- testsuite/swfdec/PASSING    24 Oct 2007 23:40:37 -0000      1.47
+++ testsuite/swfdec/PASSING    24 Oct 2007 23:54:22 -0000      1.48
@@ -361,6 +361,9 @@
 settarget-nomovie-7.swf:43bd701d73ec53d3528e830a58554d67
 settarget-nomovie-8.swf:e928cac661270840e547cb4bb82b57b6
 settarget-relative-5.swf:221055729979efd8dea86a64474ed731
+settarget-relative-6.swf:18dfc8f881ef9b0f7d52ffd4b4999f6d
+settarget-relative-7.swf:63c614bc2a052ca9f1fb9d87999de285
+settarget-relative-8.swf:f49b0132cd0c545321eb9a8d32b9ea99
 settarget2-tostring-5.swf:66b7402854ca261fc8102c916a3efe6d
 settarget2-tostring-7.swf:cfa9318ea413cc8ebf950902c952a3fd
 settarget2-tostring-8.swf:ca6f5fe29c73ef074a6ad39c0ecfa1d8