[Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/20 17:43:18

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp 

Log message:
        (CommonGetUrl): revert the loadVariables/targetLoad flags handling,
        as it broke uptoten.com. Will do better research after release..

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5708&r2=1.5709
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.198&r2=1.199

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5708
retrieving revision 1.5709
diff -u -b -r1.5708 -r1.5709
--- ChangeLog   20 Feb 2008 17:00:41 -0000      1.5708
+++ ChangeLog   20 Feb 2008 17:43:17 -0000      1.5709
@@ -1,5 +1,11 @@
 2008-02-20 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (CommonGetUrl): revert the
+         loadVariables/targetLoad flags handling, as it broke
+         uptoten.com. Will do better research after release..
+
+2008-02-20 Sandro Santilli <address@hidden>
+
        * server/vm/ASHandlers.cpp (ActionImplementsOp): better logging,
          catch bogus opcodes.
        * server/vm/ASHandlers.cpp (CommonGetUrl): only loadVariables if

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- server/vm/ASHandlers.cpp    20 Feb 2008 17:00:43 -0000      1.198
+++ server/vm/ASHandlers.cpp    20 Feb 2008 17:43:18 -0000      1.199
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.198 2008/02/20 17:00:43 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.199 2008/02/20 17:43:18 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -2213,10 +2213,6 @@
        character* target_ch = env.find_target(target.to_string());
        sprite_instance* target_movie = target_ch ? target_ch->to_movie() : 0;
 
-       movie_root& mr = VM::get().getRoot();
-
-       if ( loadTargetFlag )
-       {
                if ( loadVariableFlag )
                {
                        log_debug(_("getURL2 loadVariable"));
@@ -2225,6 +2221,7 @@
                        {
                                log_error(_("get url: target %s not found"),
                                        target_string.c_str());
+                       // might want to invoke the external url opener here...
                                return;
                        }
 
@@ -2232,6 +2229,7 @@
                        {
                                log_error(_("get url: target %s is not a 
sprite"),
                                        target_string.c_str());
+                       // might want to invoke the external url opener here...
                                return;
                        }
 
@@ -2240,6 +2238,11 @@
                        return;
                }
 
+
+       movie_root& mr = VM::get().getRoot();
+
+       if ( loadTargetFlag )
+       {
                // TODO: always pass directly to movie_root::loadMovie ?
 
                log_debug(_("getURL2 target load"));
@@ -2293,13 +2296,6 @@
                return;
        }
 
-       if ( loadVariableFlag )
-       {
-               IF_VERBOSE_MALFORMED_SWF (
-                       log_swferror("loadVariables flag of a GETURL2 opcode is 
set, but loadTarget is clear");
-               );
-       }
-
        if ( sendVarsMethod )
        {
                log_unimpl (_("Unhandled GetUrl2 sendVariableMethod (%d)"