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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/19 09:42:48

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

Log message:
        * server/swf/ASHandlers.cpp (ActionEqual): fixed behavior.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.863&r2=1.864
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -b -r1.863 -r1.864
--- ChangeLog   19 Sep 2006 08:24:57 -0000      1.863
+++ ChangeLog   19 Sep 2006 09:42:47 -0000      1.864
@@ -1,5 +1,7 @@
 2006-09-19 Sandro Santilli  <address@hidden>
 
+       * server/swf/ASHandlers.cpp (ActionEqual): fixed behavior.
+       * server/swf.h: Added info about ACTION_EQUAL.
        * server/swf/ASHandlers.cpp (CommonGetUrl): added comments about
          relative url resolution "known" bug. Added parsing of method
          bitfield flags and warnings about unsupported features.

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/swf/ASHandlers.cpp   19 Sep 2006 08:24:57 -0000      1.65
+++ server/swf/ASHandlers.cpp   19 Sep 2006 09:42:48 -0000      1.66
@@ -827,8 +827,21 @@
 {
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
+
+    assert(thread.code[thread.pc] == SWF::ACTION_EQUAL); // 0x0E
+
     ensure_stack(env, 2);
-    env.top(1).set_bool(env.top(1) == env.top(0));
+
+    as_value& op1 = env.top(0);
+    as_value& op2 = env.top(1);
+
+    env.top(1).set_bool(op1.to_number() == op2.to_number());
+
+    // Flash4 used 1 and 0 as return from this tag
+    if ( env.get_version() < 5 ) {
+      env.top(1).to_number();
+    } 
+
     env.drop(1);
 }