[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-188-gfa14199 |
|
Date: |
Mon, 07 Mar 2011 15:27:05 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via fa14199d93fe846ab290a743d0a988aeb6998359 (commit)
via 80961fadf4330b4dd6adaf6e252b698b0c72a5b4 (commit)
via 965b0769bac0869ad04df51c09789d4801c76adb (commit)
via 04bb069e249c8fae28b01c90b02f7895f36c09c4 (commit)
via c3628269966fe1a07dadd6626a44df6487ff96a5 (commit)
from 75ac1f9914cfea8762e3ea9c8bcd0ea41d8a34c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=fa14199d93fe846ab290a743d0a988aeb6998359
commit fa14199d93fe846ab290a743d0a988aeb6998359
Author: Benjamin Wolsey <address@hidden>
Date: Mon Mar 7 15:42:05 2011 +0100
Remove unneeded functions.
diff --git a/libbase/smart_ptr.h b/libbase/smart_ptr.h
index 0cc108c..9fae282 100644
--- a/libbase/smart_ptr.h
+++ b/libbase/smart_ptr.h
@@ -50,12 +50,6 @@ intrusive_ptr_release(const ref_counted* o)
o->drop_ref();
}
-// These two should not be needed when we switch all GcResource
-// pointers to use the gc_ptr instead of the intrusive_ptr
-
-inline void intrusive_ptr_add_ref(const GcResource* ) { }
-inline void intrusive_ptr_release(const GcResource* ) { }
-
} // namespace boost||gnash
http://git.savannah.gnu.org/cgit//commit/?id=80961fadf4330b4dd6adaf6e252b698b0c72a5b4
commit 80961fadf4330b4dd6adaf6e252b698b0c72a5b4
Author: Benjamin Wolsey <address@hidden>
Date: Mon Mar 7 15:30:14 2011 +0100
Drop intrusive_ptr for as_function and remove unused NetStream_as member.
diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 3323bf7..2cd9269 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -290,7 +290,6 @@ void
NetStream_as::markReachableResources() const
{
if (_netCon) _netCon->setReachable();
- if (_statusHandler) _statusHandler->setReachable();
if (_audioController) _audioController->setReachable();
if (_invalidatedVideoCharacter) _invalidatedVideoCharacter->setReachable();
}
diff --git a/libcore/asobj/NetStream_as.h b/libcore/asobj/NetStream_as.h
index 6d8e75f..2578ec9 100644
--- a/libcore/asobj/NetStream_as.h
+++ b/libcore/asobj/NetStream_as.h
@@ -405,10 +405,6 @@ protected:
// The input media parser
std::auto_ptr<media::MediaParser> m_parser;
- // Are we playing a FLV?
- // The handler which is invoked on status change
- boost::intrusive_ptr<as_function> _statusHandler;
-
// The position in the inputfile, only used when not playing a FLV
long inputPos;
diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp
b/libcore/asobj/flash/display/BitmapData_as.cpp
index a5dacca..a97fb96 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -784,7 +784,7 @@ bitmapdata_rectangle(const fn_call& fn)
// If it's not found construction will fail.
as_value rectangle(findObject(fn.env(), "flash.geom.Rectangle"));
- boost::intrusive_ptr<as_function> rectCtor = rectangle.to_function();
+ as_function* rectCtor = rectangle.to_function();
if (!rectCtor) {
IF_VERBOSE_ASCODING_ERRORS(
diff --git a/libcore/asobj/flash/geom/Matrix_as.cpp
b/libcore/asobj/flash/geom/Matrix_as.cpp
index 65a0329..79f43ff 100644
--- a/libcore/asobj/flash/geom/Matrix_as.cpp
+++ b/libcore/asobj/flash/geom/Matrix_as.cpp
@@ -412,7 +412,7 @@ matrix_deltaTransformPoint(const fn_call& fn)
// Construct a Point and set its properties.
as_value pointClass(findObject(fn.env(), "flash.geom.Point"));
- boost::intrusive_ptr<as_function> pointCtor = pointClass.to_function();
+ as_function* pointCtor = pointClass.to_function();
if (!pointCtor) {
log_error("Failed to construct flash.geom.Point!");
@@ -734,7 +734,7 @@ matrix_transformPoint(const fn_call& fn)
// Construct a Point and set its properties.
as_value pointClass(findObject(fn.env(), "flash.geom.Point"));
- boost::intrusive_ptr<as_function> pointCtor = pointClass.to_function();
+ as_function* pointCtor = pointClass.to_function();
if (!pointCtor) {
log_error("Failed to construct flash.geom.Point!");
diff --git a/libcore/asobj/flash/geom/Rectangle_as.cpp
b/libcore/asobj/flash/geom/Rectangle_as.cpp
index a880b75..7e4345a 100644
--- a/libcore/asobj/flash/geom/Rectangle_as.cpp
+++ b/libcore/asobj/flash/geom/Rectangle_as.cpp
@@ -465,7 +465,7 @@ Rectangle_bottomRight(const fn_call& fn)
as_value point(findObject(fn.env(), "flash.geom.Point"));
- boost::intrusive_ptr<as_function> pointCtor = point.to_function();
+ as_function* pointCtor = point.to_function();
if (!pointCtor) {
IF_VERBOSE_ASCODING_ERRORS(
diff --git a/testsuite/libcore.all/DisplayListTest.cpp
b/testsuite/libcore.all/DisplayListTest.cpp
index 4c8b388..bcfc45f 100644
--- a/testsuite/libcore.all/DisplayListTest.cpp
+++ b/testsuite/libcore.all/DisplayListTest.cpp
@@ -79,16 +79,16 @@ main(int /*argc*/, char** /*argv*/)
as_object* ob1 = createObject(getGlobal(*getObject(root)));
as_object* ob2 = createObject(getGlobal(*getObject(root)));
- boost::intrusive_ptr<DisplayObject> ch1 ( new DummyCharacter(ob1, root) );
- boost::intrusive_ptr<DisplayObject> ch2 ( new DummyCharacter(ob2, root) );
+ DisplayObject* ch1 ( new DummyCharacter(ob1, root) );
+ DisplayObject* ch2 ( new DummyCharacter(ob2, root) );
- dlist1.placeDisplayObject( ch1.get(), 1);
- dlist1.placeDisplayObject( ch2.get(), 2);
+ dlist1.placeDisplayObject(ch1, 1);
+ dlist1.placeDisplayObject(ch2, 2);
check(dlist1 != dlist2);
- dlist2.placeDisplayObject( ch2.get(), 1);
- dlist2.placeDisplayObject( ch1.get(), 2);
+ dlist2.placeDisplayObject(ch2, 1);
+ dlist2.placeDisplayObject(ch1, 2);
}
http://git.savannah.gnu.org/cgit//commit/?id=965b0769bac0869ad04df51c09789d4801c76adb
commit 965b0769bac0869ad04df51c09789d4801c76adb
Author: Benjamin Wolsey <address@hidden>
Date: Mon Mar 7 15:24:36 2011 +0100
Remove more intrusive_ptr usage.
diff --git a/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
b/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
index d75361d..2fa6d5b 100644
--- a/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
+++ b/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
@@ -69,7 +69,7 @@ colormatrixfilter_matrix(const fn_call& fn)
as_value
colormatrixfilter_new(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> obj = ensure<ValidThis>(fn);
+ as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new ColorMatrixFilter_as);
return as_value();
}
diff --git a/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
b/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
index deefadc..30856e6 100644
--- a/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
+++ b/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
@@ -166,7 +166,7 @@ convolutionfilter_matrix(const fn_call& fn)
as_value
convolutionfilter_new(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> obj = ensure<ValidThis>(fn);
+ as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new ConvolutionFilter_as);
return as_value();
}
diff --git a/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
index d2c1206..7b987d6 100644
--- a/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
+++ b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
@@ -187,7 +187,7 @@ displacementmapfilter_scaleY(const fn_call& fn)
as_value
displacementmapfilter_ctor(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> obj = ensure<ValidThis>(fn);
+ as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new DisplacementMapFilter_as);
return as_value();
}
diff --git a/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
b/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
index 3405354..f0deead 100644
--- a/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
@@ -226,7 +226,7 @@ dropshadowfilter_hideObject(const fn_call& fn)
as_value
dropshadowfilter_new(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> obj = ensure<ValidThis>(fn);
+ as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new DropShadowFilter_as);
return as_value();
}
diff --git a/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
b/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
index d85f944..2aaadbf 100644
--- a/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
@@ -245,7 +245,7 @@ gradientbevelfilter_type(const fn_call& fn)
as_value
gradientbevelfilter_new(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> obj = ensure<ValidThis>(fn);
+ as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new GradientBevelFilter_as);
return as_value();
}
diff --git a/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
b/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
index 7523125..66154a5 100644
--- a/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
@@ -246,7 +246,7 @@ gradientglowfilter_type(const fn_call& fn)
as_value
gradientglowfilter_new(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> obj = ensure<ValidThis>(fn);
+ as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new GradientGlowFilter_as);
return as_value();
}
diff --git a/libcore/swf/SWFIterators.h b/libcore/swf/SWFIterators.h
new file mode 100644
index 0000000..99bfda6
--- /dev/null
+++ b/libcore/swf/SWFIterators.h
@@ -0,0 +1,16 @@
+
+#ifndef NNNNNN
+#define NNNNNN
+
+#include <boost/iterator_range.hpp>
+
+
+typedef boost::iterator_range<char*> InputRange;
+
+float readFixed(InputRange& r);
+
+float readUFixed(InputRange& r);
+
+
+
+#endif
http://git.savannah.gnu.org/cgit//commit/?id=04bb069e249c8fae28b01c90b02f7895f36c09c4
commit 04bb069e249c8fae28b01c90b02f7895f36c09c4
Author: Benjamin Wolsey <address@hidden>
Date: Mon Mar 7 15:22:12 2011 +0100
Remove incomplete, uncompilable, and unmaintained extension.
diff --git a/configure.ac b/configure.ac
index e969914..0c9636e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1188,7 +1188,6 @@ ext_gtk=no
ext_lirc=no
ext_dbus=no
ext_all=no
-ext_launcher=no
extensions_list=
nextensions=0
AC_ARG_ENABLE(extensions,
@@ -1230,11 +1229,6 @@ AC_ARG_ENABLE(extensions,
ext_gtk=yes
nextensions=$((nextensions+1))
;;
- launcher|LAUNCHER)
- AC_DEFINE(USE_LAUNCHER_EXT, [1], [Build the Launcher extension])
- ext_launcher=yes
- nextensions=$((nextensions+1))
- ;;
lirc|LIRC)
AC_DEFINE(USE_LIRC_EXT, [1], [Build the LIRC extension])
ext_lirc=yes
@@ -1253,7 +1247,6 @@ AC_ARG_ENABLE(extensions,
ext_gtk=yes
ext_lirc=yes
ext_dbus=yes
- ext_launcher=yes
ext_all=yes
nextensions=9
;;
@@ -1280,7 +1273,6 @@ fi
AM_CONDITIONAL(BUILD_DEJAGNU_EXT, [ test x$ext_dejagnu = xyes ])
AM_CONDITIONAL(BUILD_FILEIO_EXT, [ test x$ext_fileio = xyes ])
AM_CONDITIONAL(BUILD_MYSQL_EXT, [ test x$ext_mysql = xyes ])
-AM_CONDITIONAL(BUILD_LAUNCHER_EXT, [ test x$ext_launcher = xyes ])
AM_CONDITIONAL(BUILD_GTK_EXT, [ test x$ext_gtk = xyes ])
AM_CONDITIONAL(BUILD_LIRC_EXT, [ test x$ext_lirc = xyes ])
AM_CONDITIONAL(BUILD_DBUS_EXT, [ test x$ext_dbus = xyes ])
diff --git a/extensions/launcher/Makefile.am b/extensions/launcher/Makefile.am
deleted file mode 100644
index b25468a..0000000
--- a/extensions/launcher/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-## Process this file with automake to generate Makefile.in
-#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# this is where Gnash plugins get installed
-pluginsdir = $(libdir)/gnash/plugins
-
-plugins_LTLIBRARIES = launcher_ext.la
-bin_PROGRAMS = launcher-gnash
-
-AM_CPPFLAGS = -DGNASHBINDIR=\"${bindir}\" \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/abc \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libcore/asobj \
- $(BOOST_CFLAGS) \
- $(NULL)
-
-launcher_ext_la_SOURCES = launcher_ext.cpp launcher_ext.h
-launcher_ext_la_LDFLAGS = -module -avoid-version -no-undefined
-launcher_ext_la_LIBDADD = $(LIBADD_DL) \
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/libcore/libgnashcore.la \
- $(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
- $(NULL)
-
-launcher_gnash_SOURCES = \
- launcher.cpp \
- md5.cpp md5.h
-launcher_gnash_CPPFLAGS = $(AM_CPPFLAGS)
-launcher_gnash_LDADD = $(top_builddir)/libbase/libgnashbase.la
-launcher_gnash_DEPENDENCIES = sums
-
-CLEANFILES = gnash-dbg.log
-
-# this is a list of Gnash executables that we're allowed to execute
-PROGS =
-
-if BUILD_GTK_GUI
-PROGS += gui/.libs/gtk-gnash
-endif
-
-if BUILD_KDE_GUI
-PROGS += gui/.libs/kde-gnash
-endif
-
-if BUILD_SDL_GUI
-PROGS += gui/.libs/sdl-gnash
-endif
-
-if BUILD_FLTK_GUI
-PROGS += gui/.libs/fltk-gnash
-endif
-
-# we don't use a dependency here, as it's too messy for make. Instead, we just
-# check to make sure the file exists, and is an executable
-sums:
- for i in $(PROGS); do \
- if test -x ../../$$i; then \
- file=`basename $$i | tr '-' '_' `; \
- rm -f $$file; \
- md5=`$(MD5SUM) ../../$$i | cut -d ' ' -f 1`; \
- echo "const char *$$file = \"$$md5\";" > $$file.h; \
- fi; \
- done
-
-check_PROGRAMS = # SharedTest
-
-install-pluginsLTLIBRARIES: $(plugins_LTLIBRARIES)
- test -d "$(DESTDIR)$(pluginsdir)" || $(mkinstalldirs)
"$(DESTDIR)$(pluginsdir)"
- $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG)
$(plugins_LTLIBRARIES) "$(DESTDIR)$(pluginsdir)/$(plugins_LTLIBRARIES)"
- $(RM) $(DESTDIR)$(pluginsdir)/*.a
-
-uninstall-local:
- $(RM) $(DESTDIR)$(pluginsdir)/launcher.so
diff --git a/extensions/launcher/launcher.cpp b/extensions/launcher/launcher.cpp
deleted file mode 100644
index e993c23..0000000
--- a/extensions/launcher/launcher.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include <iostream>
-#include <cerrno>
-#include <cstring>
-#include <cassert>
-#include <cstdlib>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef USE_GTK
-#include "gtk_gnash.h"
-#endif
-
-#ifdef USE_KDE
-#include "kde_gnash.h"
-#endif
-
-#ifdef USE_SDL
-#include "sdl_gnash.h"
-#endif
-
-#ifdef USE_FLTK
-#include "fltk_gnash.h"
-#endif
-
-#include "md5.h"
-
-using namespace std;
-
-int
-main(int argc, char *argv[])
-{
- string procname;
- pid_t childpid;
-
- char *gnash_env = std::getenv("GNASH_PLAYER");
- if (!gnash_env) {
- procname = GNASHBINDIR;
- procname += "/hildon-gnash";
- } else {
- procname = gnash_env;
- }
-
- struct stat procstats;
-
- // See if the file actually exists, otherwise we can't spawn it
- if (stat(procname.c_str(), &procstats) == -1) {
- cout << "Invalid filename: " << procname << endl;
- exit(EXIT_FAILURE);
- }
-
- // Check the MD5, as a minimal security check
- string md5 = hildon_gnash;
- if (md5_filespec_check(procname, md5)) {
- cout << "MD5 matches for " << procname << endl;
- } else {
- cout << "ERROR: MD5 doesn't match! for " << procname << endl;
- exit(EXIT_FAILURE);
- }
-
- // make a copy of ourself, the child gets replaced by the file to
- // be executed, and the parent goes away.
- childpid = fork();
-
- // childpid is -1, if the fork failed, so print out an error message
- if (childpid == -1) {
- cout << "ERROR: dup2() failed: " << strerror(errno) << endl;
- exit(EXIT_FAILURE);
- }
-
- // childpid is a positive integer, if we are the parent, and
- // fork() worked, so exit cleanly
- if (childpid > 0) {
- cout << "Forked sucessfully, child process PID is " << childpid << endl;
- exit(EXIT_SUCCESS);
- }
-
- // setup the command line for the executable we want to launch
- long win_xid;
- int win_height, win_width;
- string base_url = ".";
-
- const size_t buf_size = 30;
- char xid[buf_size], width[buf_size], height[buf_size];
- snprintf(xid, buf_size, "%ld", win_xid);
- snprintf(width, buf_size, "%d", win_width);
- snprintf(height, buf_size, "%d", win_height);
-
- // REMEMBER TO INCREMENT THE maxargc COUNT IF YOU
- // ADD NEW ARGUMENTS
- const size_t maxargc = 16;
- char **sub_argv = new char *[maxargc];
-
- size_t sub_argc = 0;
- sub_argv[sub_argc++] = const_cast<char*>( procname.c_str() );
- // don't specify rendering flags, so that the rcfile
- // will control that
- // sub_argv[sub_argc++] = "-r";
- // sub_argv[sub_argc++] = "3";
- sub_argv[sub_argc++] = "-v";
- sub_argv[sub_argc++] = "-x";
- sub_argv[sub_argc++] = xid;
- sub_argv[sub_argc++] = "-j";
- sub_argv[sub_argc++] = width;
- sub_argv[sub_argc++] = "-k";
- sub_argv[sub_argc++] = height;
- sub_argv[sub_argc++] = "-u";
- sub_argv[sub_argc++] = const_cast<char*>( base_url.c_str() );
- sub_argv[sub_argc++] = "--version";
- sub_argv[sub_argc++] = 0;
-
- assert(sub_argc <= maxargc);
-
- // Start the desired executable and go away
- cout << "Starting process: ";
-
- for (int i=0; sub_argv[i] != 0; ++i) {
- cout << sub_argv[i] << " ";
- }
- cout << endl;
-
- execv(sub_argv[0], sub_argv);
- // if execv returns, an error has occurred.
- perror(strerror(errno));
-
- delete[] sub_argv;
-
- exit (0);
-}
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
diff --git a/extensions/launcher/launcher_ext.cpp
b/extensions/launcher/launcher_ext.cpp
deleted file mode 100644
index cc300d9..0000000
--- a/extensions/launcher/launcher_ext.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include <iostream>
-
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-
-#include <string>
-#include "log.h"
-#include "launcher_ext.h"
-#include "fn_call.h"
-#include "as_object.h"
-
-using namespace std;
-
-namespace gnash
-{
-
-as_value launcher_create_md5sum(const fn_call& fn);
-as_value launcher_verify_md5sum(const fn_call& fn);
-
-Launcher::Launcher()
- : _name(0)
-{
- GNASH_REPORT_FUNCTION;
-}
-
-
-Launcher::~Launcher()
-{
- GNASH_REPORT_FUNCTION;
-}
-
-
-void
-Launcher::launch(const char *filespec)
-{
- GNASH_REPORT_FUNCTION;
-}
-
-const char *
-Launcher::create_md5sum(const char *filespec)
-{
- GNASH_REPORT_FUNCTION;
-}
-
-bool
-Launcher::verify_md5sum(const char *filespec, const char *md5)
-{
- GNASH_REPORT_FUNCTION;
-}
-
-class launcher_as_object : public as_object
-{
-public:
- Launcher obj;
-};
-
-static void
-attachInterface(as_object *obj)
-{
- GNASH_REPORT_FUNCTION;
- obj->init_member("CreateMD5sum", new
builtin_function(launcher_create_md5sum));
- obj->init_member("VerifyMD5sum", new
builtin_function(launcher_verify_md5sum));
-}
-
-static as_object*
-getInterface()
-{
- GNASH_REPORT_FUNCTION;
- static boost::intrusive_ptr<as_object> o;
- if (o == NULL) {
- o = new as_object();
- }
- return o.get();
-}
-
-static as_value
-launcher_ctor(const fn_call& /* fn */)
-{
- GNASH_REPORT_FUNCTION;
- launcher_as_object* obj = new launcher_as_object();
-
- attachInterface(obj);
- return as_value(obj); // will keep alive
-// printf ("Hello World from %s !!!\n", __PRETTY_FUNCTION__);
-}
-
-as_value
-launcher_create_md5sum(const fn_call& fn)
-{
- GNASH_REPORT_FUNCTION;
- boost::intrusive_ptr<launcher_as_object> ptr =
ensureType<launcher_as_object>(fn.this_ptr);
-
- if (fn.nargs > 0) {
- string filespec = fn.arg(0).to_string();
- return as_value(ptr->obj.create_md5sum(filespec.c_str()));
- }
- return as_value("");
-}
-
-as_value
-launcher_verify_md5sum(const fn_call& fn)
-{
- GNASH_REPORT_FUNCTION;
- boost::intrusive_ptr<launcher_as_object> ptr =
ensureType<launcher_as_object>(fn.this_ptr);
-
- if (fn.nargs > 0) {
- string filespec = fn.arg(0).to_string();
- string md5 = fn.arg(1).to_string();
- return as_value(ptr->obj.verify_md5sum(filespec.c_str(), md5.c_str()));
- }
- return as_value(true);
-}
-
-std::auto_ptr<as_object>
-init_launcher_instance()
-{
- return std::auto_ptr<as_object>(new launcher_as_object());
-}
-
-extern "C" {
- void
- launcher_class_init(as_object &obj)
- {
-// GNASH_REPORT_FUNCTION;
- // This is going to be the global "class"/"function"
- static boost::intrusive_ptr<builtin_function> cl;
- if (cl == NULL) {
- Global_as* gl = getGlobal(global);
- as_object* proto = getInterface();
- cl = gl->createClass(&launcher_ctor, proto);
-// // replicate all interface to class, to be able to access
-// // all methods as static functions
- attachInterface(cl.get());
- }
-
- obj.init_member("Launcher", cl.get());
- }
-} // end of extern C
-
-
-} // end of gnash namespace
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
diff --git a/extensions/launcher/launcher_ext.h
b/extensions/launcher/launcher_ext.h
deleted file mode 100644
index c0f52f3..0000000
--- a/extensions/launcher/launcher_ext.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifndef __LAUNCHER_PLUGIN_H__
-#define __LAUNCHER_PLUGIN_H__
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include <memory> // for auto_ptr
-#include "as_object.h"
-
-namespace gnash
-{
-
-class Launcher {
-public:
- Launcher();
- ~Launcher();
- void launch(const char *filespec);
- const char *create_md5sum(const char *filespec);
- bool verify_md5sum(const char *filespec, const char *md5);
-private:
- const char *_name;
-};
-
-extern "C" {
- void launcher_class_init(as_object &obj);
- /// Return an instance
-}
-
-std::auto_ptr<as_object> init_launcher_instance();
-
-} // end of gnash namespace
-
-// __LAUNCHER_PLUGIN_H__
-#endif
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
diff --git a/extensions/launcher/md5.cpp b/extensions/launcher/md5.cpp
deleted file mode 100644
index f60986d..0000000
--- a/extensions/launcher/md5.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-/* Functions to compute MD5 message digest of files or memory blocks.
- according to the definition of MD5 in RFC 1321 from April 1992.
- Copyright (C) 1995,1996,1997,1999,2000,2001,2005, 2009
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-/* Written by Ulrich Drepper <address@hidden>, 1995. */
-/* Trimmed by Rob Savoye for Gnash, and converted to C++ <address@hidden>,
2007. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <cstdlib>
-#include <cstring>
-#include <string>
-
-#include "md5.h"
-#include "log.h"
-
-using namespace gnash;
-using namespace std;
-
-#ifdef WORDS_BIGENDIAN
-# define SWAP(n) \
- (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
-#else
-# define SWAP(n) (n)
-#endif
-
-
-/* This array contains the bytes used to pad the buffer to the next
- 64-byte boundary. (RFC 1321, 3.1: Step 1) */
-static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ };
-
-
-/* Initialize structure containing state of computation.
- (RFC 1321, 3.3: Step 3) */
-void
-md5_init_ctx (struct md5_ctx *ctx)
-{
- ctx->A = 0x67452301;
- ctx->B = 0xefcdab89;
- ctx->C = 0x98badcfe;
- ctx->D = 0x10325476;
-
- ctx->total[0] = ctx->total[1] = 0;
- ctx->buflen = 0;
-}
-
-/* Put result from CTX in first 16 bytes following RESBUF. The result
- must be in little endian byte order.
-
- IMPORTANT: On some systems it is required that RESBUF is correctly
- aligned for a 32 bits value. */
-void *
-md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
-{
- ((uint32_t *) resbuf)[0] = SWAP (ctx->A);
- ((uint32_t *) resbuf)[1] = SWAP (ctx->B);
- ((uint32_t *) resbuf)[2] = SWAP (ctx->C);
- ((uint32_t *) resbuf)[3] = SWAP (ctx->D);
-
- return resbuf;
-}
-
-/* Process the remaining bytes in the internal buffer and the usual
- prolog according to the standard and write the result to RESBUF.
-
- IMPORTANT: On some systems it is required that RESBUF is correctly
- aligned for a 32 bits value. */
-void *
-md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
-{
- /* Take yet unprocessed bytes into account. */
- uint32_t bytes = ctx->buflen;
- size_t pad;
-
- /* Now count remaining bytes. */
- ctx->total[0] += bytes;
- if (ctx->total[0] < bytes)
- ++ctx->total[1];
-
- pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
- memcpy (&ctx->buffer[bytes], fillbuf, pad);
-
- /* Put the 64-bit file length in *bits* at the end of the buffer. */
- *(uint32_t *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
- *(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
- (ctx->total[0] >> 29));
-
- /* Process last bytes. */
- md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
-
- return md5_read_ctx (ctx, resbuf);
-}
-
-/* Compute MD5 message digest for bytes read from STREAM. The
- resulting message digest number will be written into the 16 bytes
- beginning at RESBLOCK. */
-int
-md5_stream (FILE *stream, void *resblock)
-{
- /* Important: BLOCKSIZE must be a multiple of 64. */
-#define BLOCKSIZE 4096
- struct md5_ctx ctx;
- char buffer[BLOCKSIZE + 72];
- size_t sum;
-
- /* Initialize the computation context. */
- md5_init_ctx (&ctx);
-
- /* Iterate over full file contents. */
- while (1)
- {
- /* We read the file in blocks of BLOCKSIZE bytes. One call of the
- computation function processes the whole buffer so that with the
- next round of the loop another block can be read. */
- size_t n;
- sum = 0;
-
- /* Read block. Take care for partial reads. */
- do
- {
- n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
-
- sum += n;
- }
- while (sum < BLOCKSIZE && n != 0);
- if (n == 0 && ferror (stream))
- return 1;
-
- /* If end of file is reached, end the loop. */
- if (n == 0)
- break;
-
- /* Process buffer with BLOCKSIZE bytes. Note that
- BLOCKSIZE % 64 == 0
- */
- md5_process_block (buffer, BLOCKSIZE, &ctx);
- }
-
- /* Add the last bytes if necessary. */
- if (sum > 0)
- md5_process_bytes (buffer, sum, &ctx);
-
- /* Construct result in desired memory. */
- md5_finish_ctx (&ctx, resblock);
- return 0;
-}
-
-/* Compute MD5 message digest for bytes read from filespec. The
- resulting message digest number will be written into the 16 bytes
- beginning at RESBLOCK. */
-bool
-md5_filespec (string &filespec, void *resblock)
-{
- /* Important: BLOCKSIZE must be a multiple of 64. */
-#define BLOCKSIZE 4096
- struct md5_ctx ctx;
- char buffer[BLOCKSIZE + 72];
- size_t sum;
-
- /* Initialize the computation context. */
- md5_init_ctx (&ctx);
-
- FILE *fp;
- fp = fopen (filespec.c_str(), "rb");
-
- /* Iterate over full file contents. */
- while (1) {
- /* We read the file in blocks of BLOCKSIZE bytes. One call of the
- computation function processes the whole buffer so that with the
- next round of the loop another block can be read. */
- size_t n;
- sum = 0;
-
- /* Read block. Take care for partial reads. */
- do
- {
- n = fread (buffer + sum, 1, BLOCKSIZE - sum, fp);
-
- sum += n;
- }
- while (sum < BLOCKSIZE && n != 0);
- if (n == 0 && ferror (fp))
- return false;
-
- /* If end of file is reached, end the loop. */
- if (n == 0)
- break;
-
- /* Process buffer with BLOCKSIZE bytes. Note that
- BLOCKSIZE % 64 == 0
- */
- md5_process_block (buffer, BLOCKSIZE, &ctx);
- }
-
- /* Add the last bytes if necessary. */
- if (sum > 0)
- md5_process_bytes (buffer, sum, &ctx);
-
- /* Construct result in desired memory. */
- md5_finish_ctx (&ctx, resblock);
- return true;
-}
-
-// Compute MD5 message digest for bytes read from filespec. The result
-// is compared to the ascii version of the MD5 (as produced by the
-// shell utility md5sum).
-bool
-md5_filespec_check(std::string &filespec, std::string &md5)
-{
- unsigned char resblock[MD5_DIGEST_SIZE+1];
- char result[(MD5_DIGEST_SIZE*2)+1];
- memset(resblock, 0, MD5_DIGEST_SIZE+1);
- memset(result, 0, (MD5_DIGEST_SIZE*2)+1);
- md5_filespec(filespec, resblock);
-
- hexify((unsigned char *)result, resblock, MD5_DIGEST_SIZE, false);
-// printf("FIXME: %s == \n %s\n", result, md5.c_str());
- if (memcmp(result, md5.c_str(), MD5_DIGEST_SIZE) == 0) {
- return true;
- } else {
- return false;
- }
-}
-
-/* compute MD5 message digest for LEN bytes beginning at BUFFER. The
- result is always in little endian byte order, so that a byte-wise
- output yields to the wanted ASCII representation of the message
- digest. */
-void *
-md5_buffer (const char *buffer, size_t len, void *resblock)
-{
- struct md5_ctx ctx;
-
- /* Initialize the computation context. */
- md5_init_ctx (&ctx);
-
- /* Process whole buffer but last len % 64 bytes. */
- md5_process_bytes (buffer, len, &ctx);
-
- /* Put result in desired memory area. */
- return md5_finish_ctx (&ctx, resblock);
-}
-
-
-void
-md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
-{
- /* When we already have some bits in our internal buffer concatenate
- both inputs first. */
- if (ctx->buflen != 0)
- {
- size_t left_over = ctx->buflen;
- size_t add = 128 - left_over > len ? len : 128 - left_over;
-
- memcpy (&ctx->buffer[left_over], buffer, add);
- ctx->buflen += add;
-
- if (ctx->buflen > 64)
- {
- md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
-
- ctx->buflen &= 63;
- /* The regions in the following copy operation cannot overlap. */
- memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
- ctx->buflen);
- }
-
- buffer = (const char *) buffer + add;
- len -= add;
- }
-
- /* Process available complete blocks. */
- if (len >= 64)
- {
-#if !_STRING_ARCH_unaligned
-/* To check alignment gcc has an appropriate operator. Other
- compilers don't. */
-# if __GNUC__ >= 2
-# define UNALIGNED_P(p) (((md5_uintptr) p) % __alignof__ (uint32_t) != 0)
-# else
-# define UNALIGNED_P(p) (((md5_uintptr) p) % sizeof (uint32_t) != 0)
-# endif
- if (UNALIGNED_P (buffer))
- while (len > 64)
- {
- md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
- buffer = (const char *) buffer + 64;
- len -= 64;
- }
- else
-#endif
- {
- md5_process_block (buffer, len & ~63, ctx);
- buffer = (const char *) buffer + (len & ~63);
- len &= 63;
- }
- }
-
- /* Move remaining bytes in internal buffer. */
- if (len > 0)
- {
- size_t left_over = ctx->buflen;
-
- memcpy (&ctx->buffer[left_over], buffer, len);
- left_over += len;
- if (left_over >= 64)
- {
- md5_process_block (ctx->buffer, 64, ctx);
- left_over -= 64;
- memcpy (ctx->buffer, &ctx->buffer[64], left_over);
- }
- ctx->buflen = left_over;
- }
-}
-
-
-/* These are the four functions used in the four steps of the MD5 algorithm
- and defined in the RFC 1321. The first function is a little bit optimized
- (as found in Colin Plumbs public domain implementation). */
-/* #define FF(b, c, d) ((b & c) | (~b & d)) */
-#define FF(b, c, d) (d ^ (b & (c ^ d)))
-#define FG(b, c, d) FF (d, b, c)
-#define FH(b, c, d) (b ^ c ^ d)
-#define FI(b, c, d) (c ^ (b | ~d))
-
-/* Process LEN bytes of BUFFER, accumulating context into CTX.
- It is assumed that LEN % 64 == 0. */
-
-void
-md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
-{
- uint32_t correct_words[16];
- const uint32_t *words = (uint32_t *)buffer;
- size_t nwords = len / sizeof (uint32_t);
- const uint32_t *endp = words + nwords;
- uint32_t A = ctx->A;
- uint32_t B = ctx->B;
- uint32_t C = ctx->C;
- uint32_t D = ctx->D;
-
- /* First increment the byte count. RFC 1321 specifies the possible
- length of the file up to 2^64 bits. Here we only compute the
- number of bytes. Do a double word increment. */
- ctx->total[0] += len;
- if (ctx->total[0] < len)
- ++ctx->total[1];
-
- /* Process all bytes in the buffer with 64 bytes in each round of
- the loop. */
- while (words < endp)
- {
- uint32_t *cwp = correct_words;
- uint32_t A_save = A;
- uint32_t B_save = B;
- uint32_t C_save = C;
- uint32_t D_save = D;
-
- /* First round: using the given function, the context and a constant
- the next context is computed. Because the algorithms processing
- unit is a 32-bit word and it is determined to work on words in
- little endian byte order we perhaps have to change the byte order
- before the computation. To reduce the work for the next steps
- we store the swapped words in the array CORRECT_WORDS. */
-
-#define OP(a, b, c, d, s, T) \
- do \
- { \
- a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
- ++words; \
- CYCLIC (a, s); \
- a += b; \
- } \
- while (0)
-
- /* It is unfortunate that C does not provide an operator for
- cyclic rotation. Hope the C compiler is smart enough. */
-#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
-
- /* Before we start, one word to the strange constants.
- They are defined in RFC 1321 as
-
- T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
- */
-
- /* Round 1. */
- OP (A, B, C, D, 7, 0xd76aa478);
- OP (D, A, B, C, 12, 0xe8c7b756);
- OP (C, D, A, B, 17, 0x242070db);
- OP (B, C, D, A, 22, 0xc1bdceee);
- OP (A, B, C, D, 7, 0xf57c0faf);
- OP (D, A, B, C, 12, 0x4787c62a);
- OP (C, D, A, B, 17, 0xa8304613);
- OP (B, C, D, A, 22, 0xfd469501);
- OP (A, B, C, D, 7, 0x698098d8);
- OP (D, A, B, C, 12, 0x8b44f7af);
- OP (C, D, A, B, 17, 0xffff5bb1);
- OP (B, C, D, A, 22, 0x895cd7be);
- OP (A, B, C, D, 7, 0x6b901122);
- OP (D, A, B, C, 12, 0xfd987193);
- OP (C, D, A, B, 17, 0xa679438e);
- OP (B, C, D, A, 22, 0x49b40821);
-
- /* For the second to fourth round we have the possibly swapped words
- in CORRECT_WORDS. Redefine the macro to take an additional first
- argument specifying the function to use. */
-#undef OP
-#define OP(f, a, b, c, d, k, s, T) \
- do \
- { \
- a += f (b, c, d) + correct_words[k] + T; \
- CYCLIC (a, s); \
- a += b; \
- } \
- while (0)
-
- /* Round 2. */
- OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
- OP (FG, D, A, B, C, 6, 9, 0xc040b340);
- OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
- OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
- OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
- OP (FG, D, A, B, C, 10, 9, 0x02441453);
- OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
- OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
- OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
- OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
- OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
- OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
- OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
- OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
- OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
- OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
-
- /* Round 3. */
- OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
- OP (FH, D, A, B, C, 8, 11, 0x8771f681);
- OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
- OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
- OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
- OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
- OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
- OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
- OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
- OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
- OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
- OP (FH, B, C, D, A, 6, 23, 0x04881d05);
- OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
- OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
- OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
- OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
-
- /* Round 4. */
- OP (FI, A, B, C, D, 0, 6, 0xf4292244);
- OP (FI, D, A, B, C, 7, 10, 0x432aff97);
- OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
- OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
- OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
- OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
- OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
- OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
- OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
- OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
- OP (FI, C, D, A, B, 6, 15, 0xa3014314);
- OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
- OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
- OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
- OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
- OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
-
- /* Add the starting values of the context. */
- A += A_save;
- B += B_save;
- C += C_save;
- D += D_save;
- }
-
- /* Put checksum in context given as argument. */
- ctx->A = A;
- ctx->B = B;
- ctx->C = C;
- ctx->D = D;
-}
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
diff --git a/extensions/launcher/md5.h b/extensions/launcher/md5.h
deleted file mode 100644
index c7ae02d..0000000
--- a/extensions/launcher/md5.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// Declaration of functions and data types used for MD5 sum computing
-// library functions.
-// Copyright (C) 1995-1997,1999,2000,2001,2004,2005, 2009
-// Free Software Foundation, Inc.
-// This file is part of the GNU C Library.
-// The GNU C Library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-
-// The GNU C Library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with the GNU C Library; if not, write to the Free
-// Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-// 02111-1307 USA.
-
-// Written by Ulrich Drepper <address@hidden>, 1995.
-// Trimmed by Rob Savoye for Gnash, and converted to C++ <address@hidden>,
2007.
-
-#ifndef _MD5_H
-#define _MD5_H 1
-
-#include <cstdio>
-#include <string>
-#include <boost/cstdint.hpp>
-
-// #if defined HAVE_LIMITS_H
-// # include <limits.h>
-// #endif
-
-#define MD5_DIGEST_SIZE 16
-#define MD5_BLOCK_SIZE 64
-
-typedef unsigned long md5_uintptr;
-
-// Structure to save state of computation between the single steps.
-struct md5_ctx
-{
- uint32_t A;
- uint32_t B;
- uint32_t C;
- uint32_t D;
-
- uint32_t total[2];
- uint32_t buflen;
- char buffer[128] __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
-};
-
-// The following three functions are build up the low level used in
-// the functions `md5_stream' and `md5_buffer'.
-
-// Initialize structure containing state of computation.
-// (RFC 1321, 3.3: Step 3)
-void md5_init_ctx (struct md5_ctx *ctx);
-
-// Starting with the result of former calls of this function (or the
-// initialization function update the context for the next LEN bytes
-// starting at BUFFER.
-// It is necessary that LEN is a multiple of 64!!!
-void md5_process_block (const void *buffer, size_t len,
- struct md5_ctx *ctx);
-
-// Starting with the result of former calls of this function (or the
-// initialization function update the context for the next LEN bytes
-// starting at BUFFER.
-// It is NOT required that LEN is a multiple of 64.
-void md5_process_bytes (const void *buffer, size_t len,
- struct md5_ctx *ctx);
-
-// Process the remaining bytes in the buffer and put result from CTX
-// in first 16 bytes following RESBUF. The result is always in little
-// endian byte order, so that a byte-wise output yields to the wanted
-// ASCII representation of the message digest.
-
-// IMPORTANT: On some systems it is required that RESBUF is correctly
-// aligned for a 32 bits value.
-void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf);
-
-
-// Put result from CTX in first 16 bytes following RESBUF. The result is
-// always in little endian byte order, so that a byte-wise output yields
-// to the wanted ASCII representation of the message digest.
-
-// IMPORTANT: On some systems it is required that RESBUF is correctly
-// aligned for a 32 bits value.
-void *md5_read_ctx (const struct md5_ctx *ctx, void *resbuf);
-
-// Compute MD5 message digest for bytes read from STREAM. The
-// resulting message digest number will be written into the 16 bytes
-// beginning at RESBLOCK.
-int md5_stream (FILE *stream, void *resblock);
-
-// Compute MD5 message digest for bytes read from filespec. The
-// resulting message digest number will be written into the 16 bytes
-// beginning at RESBLOCK.
-bool md5_filespec(std::string &filespec, void *resblock);
-
-// Compute MD5 message digest for bytes read from filespec. The result
-// is compared to the ascii version of the MD5 (as produced by the
-// shell utility md5sum).
-bool md5_filespec_check(std::string &filespec, std::string &md5);
-
-// Compute MD5 message digest for LEN bytes beginning at BUFFER. The
-// result is always in little endian byte order, so that a byte-wise
-// output yields to the wanted ASCII representation of the message
-// digest.
-void *md5_buffer (const char *buffer, size_t len,
- void *resblock);
-
-#endif /* md5.h */
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
diff --git a/extensions/launcher/test.as b/extensions/launcher/test.as
deleted file mode 100644
index 652cf8a..0000000
--- a/extensions/launcher/test.as
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-// Test case for lirc ActionScript class
-// compile this test case with Ming makeswf, and then
-// execute it like this gnash -1 -r 0 -v out.swf
-
-
-var exe = new Launcher();
-
-// test the constuctor
-if (exe) {
- trace("Launcher() constructor works");
-} else {
- trace("Launcher() constructor failed");
-}
-
-if (!exe) {
- trace("UNTESTED: extensions not built!");
-}
-
-// If the extension doesn't load, don't do anything.
-if (exe) {
- trace("ERROR: Launcher: UNIMPLEMENTED");
-}
-
-
http://git.savannah.gnu.org/cgit//commit/?id=c3628269966fe1a07dadd6626a44df6487ff96a5
commit c3628269966fe1a07dadd6626a44df6487ff96a5
Author: Benjamin Wolsey <address@hidden>
Date: Mon Mar 7 15:20:54 2011 +0100
Remove some intrusive_ptr usage.
diff --git a/libcore/asobj/LoadableObject.cpp b/libcore/asobj/LoadableObject.cpp
index 26e0d6e..98e1446 100644
--- a/libcore/asobj/LoadableObject.cpp
+++ b/libcore/asobj/LoadableObject.cpp
@@ -143,7 +143,7 @@ private:
as_value
loadableobject_getBytesLoaded(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> ptr = ensure<ValidThis>(fn);
+ as_object* ptr = ensure<ValidThis>(fn);
as_value bytesLoaded;
ptr->get_member(NSV::PROP_uBYTES_LOADED, &bytesLoaded);
return bytesLoaded;
@@ -152,7 +152,7 @@ loadableobject_getBytesLoaded(const fn_call& fn)
as_value
loadableobject_getBytesTotal(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> ptr = ensure<ValidThis>(fn);
+ as_object* ptr = ensure<ValidThis>(fn);
as_value bytesTotal;
ptr->get_member(NSV::PROP_uBYTES_TOTAL, &bytesTotal);
return bytesTotal;
@@ -248,7 +248,7 @@ loadableobject_addRequestHeader(const fn_call& fn)
as_value
loadableobject_decode(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> ptr = ensure<ValidThis>(fn);
+ as_object* ptr = ensure<ValidThis>(fn);
if (!fn.nargs) return as_value(false);
diff --git a/libcore/asobj/flash/filters/GlowFilter_as.cpp
b/libcore/asobj/flash/filters/GlowFilter_as.cpp
index 002e5df..570c4bd 100644
--- a/libcore/asobj/flash/filters/GlowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GlowFilter_as.cpp
@@ -179,7 +179,7 @@ glowfilter_knockout(const fn_call& fn)
as_value
glowfilter_new(const fn_call& fn)
{
- boost::intrusive_ptr<as_object> obj = ensure<ValidThis>(fn);
+ as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new GlowFilter_as);
return as_value();
}
diff --git a/libcore/asobj/flash/geom/Rectangle_as.h
b/libcore/asobj/flash/geom/Rectangle_as.h
index c0b46aa..10923e9 100644
--- a/libcore/asobj/flash/geom/Rectangle_as.h
+++ b/libcore/asobj/flash/geom/Rectangle_as.h
@@ -32,9 +32,6 @@ struct ObjectURI;
/// Initialize the global Rectangle class
void rectangle_class_init(as_object& where, const ObjectURI& uri);
-/// Return a Rectangle instance (in case the core lib needs it)
-boost::intrusive_ptr<as_object> init_Rectangle_instance();
-
} // end of gnash namespace
// __GNASH_ASOBJ_RECTANGLE_H__
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 8 -
extensions/launcher/Makefile.am | 93 ----
extensions/launcher/launcher.cpp | 156 ------
extensions/launcher/launcher_ext.cpp | 170 -------
extensions/launcher/launcher_ext.h | 58 ---
extensions/launcher/md5.cpp | 507 --------------------
extensions/launcher/md5.h | 118 -----
extensions/launcher/test.as | 43 --
libbase/smart_ptr.h | 6 -
libcore/asobj/LoadableObject.cpp | 6 +-
libcore/asobj/NetStream_as.cpp | 1 -
libcore/asobj/NetStream_as.h | 4 -
libcore/asobj/flash/display/BitmapData_as.cpp | 2 +-
.../asobj/flash/filters/ColorMatrixFilter_as.cpp | 2 +-
.../asobj/flash/filters/ConvolutionFilter_as.cpp | 2 +-
.../flash/filters/DisplacementMapFilter_as.cpp | 2 +-
.../asobj/flash/filters/DropShadowFilter_as.cpp | 2 +-
libcore/asobj/flash/filters/GlowFilter_as.cpp | 2 +-
.../asobj/flash/filters/GradientBevelFilter_as.cpp | 2 +-
.../asobj/flash/filters/GradientGlowFilter_as.cpp | 2 +-
libcore/asobj/flash/geom/Matrix_as.cpp | 4 +-
libcore/asobj/flash/geom/Rectangle_as.cpp | 2 +-
libcore/asobj/flash/geom/Rectangle_as.h | 3 -
libcore/swf/SWFIterators.h | 16 +
testsuite/libcore.all/DisplayListTest.cpp | 12 +-
25 files changed, 36 insertions(+), 1187 deletions(-)
delete mode 100644 extensions/launcher/Makefile.am
delete mode 100644 extensions/launcher/launcher.cpp
delete mode 100644 extensions/launcher/launcher_ext.cpp
delete mode 100644 extensions/launcher/launcher_ext.h
delete mode 100644 extensions/launcher/md5.cpp
delete mode 100644 extensions/launcher/md5.h
delete mode 100644 extensions/launcher/test.as
create mode 100644 libcore/swf/SWFIterators.h
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-188-gfa14199,
Benjamin Wolsey <=