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

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/misc-ming.all: FlashVarsTest.as FlashVarsTest.html 
                                 Makefile.am 

Log message:
                * server/sprite_instance.cpp (setVariables):
                  Convert variable names to lowercase when needed.
                * testsuite/misc-ming.all/: Makefile.am, 
FlashVarsTest.{as,html}:
                  Test that parameter names are converted to lowercase when 
target
                  SWF is < 7.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4015&r2=1.4016
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.308&r2=1.309
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/FlashVarsTest.as?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/FlashVarsTest.html?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.146&r2=1.147

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4015
retrieving revision 1.4016
diff -u -b -r1.4015 -r1.4016
--- ChangeLog   17 Aug 2007 13:57:36 -0000      1.4015
+++ ChangeLog   17 Aug 2007 18:02:35 -0000      1.4016
@@ -1,3 +1,11 @@
+2007-08-17 Sandro Santilli <address@hidden>
+
+       * server/sprite_instance.cpp (setVariables):
+         Convert variable names to lowercase when needed.
+       * testsuite/misc-ming.all/: Makefile.am, FlashVarsTest.{as,html}:
+         Test that parameter names are converted to lowercase when target
+         SWF is < 7.
+
 2007-08-17 Benjamin Wolsey <address@hidden>
 
        * server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -b -r1.308 -r1.309
--- server/sprite_instance.cpp  13 Aug 2007 07:20:09 -0000      1.308
+++ server/sprite_instance.cpp  17 Aug 2007 18:02:35 -0000      1.309
@@ -3563,7 +3563,7 @@
        {
                const string& name = it->first;
                const string& val = it->second;
-               set_member(name, val.c_str());
+               set_member(PROPNAME(name), val.c_str());
        }
 }
 

Index: testsuite/misc-ming.all/FlashVarsTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/FlashVarsTest.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/FlashVarsTest.as    26 Jul 2007 03:41:21 -0000      
1.3
+++ testsuite/misc-ming.all/FlashVarsTest.as    17 Aug 2007 18:02:36 -0000      
1.4
@@ -19,8 +19,8 @@
 // and url querystring.
 //
 // execute the movie by passing:
-//     QueryString="?a=a_in_qstring&q=q_in_qstring"
-//     FlashVars="?a=a_in_fvars&q=q_in_fvars"
+//     QueryString="?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr"
+//     FlashVars="?a=a_in_fvars&q=q_in_fvars&MixCaseFvars=mixFvars"
 //
 // QueryString is what appears embedded in the url,
 // FlashVars can be given as an attribute of the <embed> tag
@@ -28,7 +28,8 @@
 //
 // Example:
 //
-// gnash -P "FlashVars=?a=a_in_fvars&v=v_in_fvars" 
"FlashParamTest.swf?a=a_in_qstring&q=q_in_qstring"
+// gnash -P "FlashVars=?a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars"  
+//     "FlashParamTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQst"
 //
 // See FlashVarsTest.html for a way to test with a plugin
 //
@@ -51,4 +52,18 @@
 check(_root.hasOwnProperty('v'));
 check_equals(_root.v, "v_in_fvars");
 
+#if OUTPUT_VERSION < 7
+       // The following tests assume target SWF version is < 7
+       check_equals(_root.mixcaseqstr, "mixQstr");
+       check_equals(_root.mixcasefvars, "mixFvars");
+#else // OUTPUT_VERSION >= 7
+       // This is currently not used, would need a bit of work
+       // in the Makefile.am to be used
+       // (build both v6 and v7 versions of this test)
+       check_equals(typeof(_root.mixcaseqstr), "undefined");
+       check_equals(typeof(_root.mixcasefvars), "undefined");
+       check_equals(_root.MixCaseQstr, "mixQstr");
+       check_equals(_root.MixCaseFvars, "mixFvars");
+#endif // OUTPUT_VERSION >= 7
+
 totals();

Index: testsuite/misc-ming.all/FlashVarsTest.html
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/FlashVarsTest.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/FlashVarsTest.html  28 Mar 2007 10:52:34 -0000      
1.1
+++ testsuite/misc-ming.all/FlashVarsTest.html  17 Aug 2007 18:02:36 -0000      
1.2
@@ -7,5 +7,7 @@
 
 -->
 
-<embed type="application/x-shockwave-flash" 
src="FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring" 
FlashVars="&a=a_in_fvars&v=v_in_fvars"
+<embed type="application/x-shockwave-flash"
+ src="FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr"
+ FlashVars="&a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars"
  height="600" width="800">

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- testsuite/misc-ming.all/Makefile.am 16 Aug 2007 06:09:14 -0000      1.146
+++ testsuite/misc-ming.all/Makefile.am 17 Aug 2007 18:02:36 -0000      1.147
@@ -1402,9 +1402,9 @@
 
 # This will only work with Ming-0.4.0beta2 (support for prebuilt clips 
inclusion)
 FlashVarsTest.swf: Dejagnu.swf $(srcdir)/FlashVarsTest.as 
-       $(MAKESWF) -o $@ Dejagnu.swf $(srcdir)/FlashVarsTest.as
+       $(MAKESWF) -DOUTPUT_VERSION=6 -v6 -o $@ Dejagnu.swf 
$(srcdir)/FlashVarsTest.as
 FlashVarsTest-Runner: $(srcdir)/../generic-testrunner.sh FlashVarsTest.swf
-       echo "$(top_builddir)/gui/gnash -1 -r0 -v -P 
'FlashVars=?a=a_in_fvars&v=v_in_fvars' 
'FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring'" > $@
+       echo "$(top_builddir)/gui/gnash -1 -r0 -v -P 
'FlashVars=?a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars' 
'FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr'" > $@
        chmod 755 $@
 
 init_action_test_SOURCES =     \