[Gnash-commit] gnash ChangeLog server/swf_function.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/09 10:23:02

Modified files:
        .              : ChangeLog 
        server         : swf_function.cpp 

Log message:
                * server/swf_function.cpp (operator()):
                  Fix 'this' reference in function2 (both register and local 
var,
                  only the latter tested but I'd assume the former would also 
work).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2059&r2=1.2060
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2059
retrieving revision 1.2060
diff -u -b -r1.2059 -r1.2060
--- ChangeLog   9 Jan 2007 02:13:59 -0000       1.2059
+++ ChangeLog   9 Jan 2007 10:23:02 -0000       1.2060
@@ -1,4 +1,10 @@
-2007-01-08 Sandro Santilli <address@hidden>
+2007-01-09 Sandro Santilli <address@hidden>
+
+       * server/swf_function.cpp (operator()):
+         Fix 'this' reference in function2 (both register and local var,
+         only the latter tested but I'd assume the former would also work).
+
+2007-01-09 Sandro Santilli <address@hidden>
 
        * server/vm/ASHandlers.cpp (ActionSetRegister, ActionPushData):
          when setting/getting registers in function2 context and local

Index: server/swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/swf_function.cpp     2 Jan 2007 12:51:32 -0000       1.13
+++ server/swf_function.cpp     9 Jan 2007 10:23:02 -0000       1.14
@@ -214,10 +214,7 @@
                if (m_function2_flags & 0x01)
                {
                        // preload 'this' into a register.
-                       // TODO FIXME: shouldn't this be 'fn.this_ptr' rather 
then our_env->get_target() ?
-                       //        see implementation for function1.. We need a 
testcase!
-                       
our_env->local_register(current_reg).set_as_object(our_env->get_target());
-                       log_warning("UNTESTED: 'this' in function2 dispatch 
(register)");
+                       
our_env->local_register(current_reg).set_as_object(fn.this_ptr); 
                        current_reg++;
                }
 
@@ -228,10 +225,7 @@
                else
                {
                        // Put 'this' in a local var.
-                       // TODO FIXME: shouldn't this be 'fn.this_ptr' rather 
then our_env->get_target() ?
-                       //        see implementation for function1.. We need a 
testcase!
-                       our_env->add_local("this", 
as_value(our_env->get_target()));
-                       log_warning("UNTESTED: 'this' in function2 dispatch 
(local var)");
+                       our_env->add_local("this", as_value(fn.this_ptr));
                }
 
                // Init arguments array, if it's going to be needed.