[Gnash-commit] gnash ChangeLog libbase/URL.cpp libbase/contain...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/10 14:06:36

Modified files:
        .              : ChangeLog 
        libbase        : URL.cpp container.h network.cpp network.h 
                         tu_config.h tu_timer.cpp 
        server         : shm.cpp shm.h 
        server/vm      : ASHandlers.cpp 
        utilities      : dumpshm.cpp 

Log message:
        Patch from bug #20741 by Paul Smedley <address@hidden>:
        
                * libbase/URL.cpp, libbase/container.h, libbase/network.cpp,
                  libbase/network.h, libbase/tu_config.h, libbase/tu_timer.cpp,
                  server/shm.cpp, server/shm.h, server/vm/ASHandlers.cpp,
                  utilities/dumpshm.cpp: Build support for OS/2.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3983&r2=1.3984
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/URL.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_config.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3983
retrieving revision 1.3984
diff -u -b -r1.3983 -r1.3984
--- ChangeLog   10 Aug 2007 14:03:12 -0000      1.3983
+++ ChangeLog   10 Aug 2007 14:06:34 -0000      1.3984
@@ -1,3 +1,10 @@
+2007-08-10 Paul Smedley <address@hidden>
+
+       * libbase/URL.cpp, libbase/container.h, libbase/network.cpp,
+         libbase/network.h, libbase/tu_config.h, libbase/tu_timer.cpp,
+         server/shm.cpp, server/shm.h, server/vm/ASHandlers.cpp,
+         utilities/dumpshm.cpp: Build support for OS/2.
+
 2007-08-10 Sandro Santilli <address@hidden>
 
        * server/parser/Timeline.h (getFrameDepths): lock the mutex, as

Index: libbase/URL.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/URL.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- libbase/URL.cpp     1 Jul 2007 10:54:07 -0000       1.39
+++ libbase/URL.cpp     10 Aug 2007 14:06:35 -0000      1.40
@@ -148,7 +148,7 @@
 URL::normalize_path(std::string& path)
 {
 
-#if defined(_WIN32) || defined(WIN32) 
+#if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
        return;
 #endif
 
@@ -277,9 +277,11 @@
 
                assert(basedir[0] == '/'
                        || basedir[1] == ':');  // for WIN32
+#ifndef __OS2__
+               // On OS/2 - a filepath such as x:file.swf is acceptable.......
                assert(*(basedir.rbegin()) == '/' 
                        || *(basedir.rbegin()) == '\\');        // for WIN32
-
+#endif
                string::size_type lpos =  basedir.size()-1;
                for (int i=0; i<dirsback; ++i)
                {

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- libbase/container.h 1 Jul 2007 10:54:07 -0000       1.59
+++ libbase/container.h 10 Aug 2007 14:06:35 -0000      1.60
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: container.h,v 1.59 2007/07/01 10:54:07 bjacques Exp $ */
+/* $Id: container.h,v 1.60 2007/08/10 14:06:35 strk Exp $ */
 
 #ifndef __CONTAINER_H__
 #define __CONTAINER_H__
@@ -40,7 +40,7 @@
 // corrent paths supplied, this one file barfs with GCC 3.3.3 on
 // NetBSD, so screw it, and just hack it for now. We hope this entire
 // file will be gone soon anyway.
-#ifndef HAVE_WINSOCK_H
+#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
 #define _LIB_PTHREAD_ 1
 #ifndef _LIB_PTHREAD_TYPES_H
 #  define _LIB_PTHREAD_TYPES_H 1

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libbase/network.cpp 1 Jul 2007 10:54:09 -0000       1.28
+++ libbase/network.cpp 10 Aug 2007 14:06:35 -0000      1.29
@@ -30,7 +30,7 @@
 #include <cstdio>
 #include <cerrno>
 #include <fcntl.h>
-#ifdef HAVE_WINSOCK_H
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
 # include <winsock2.h>
 # include <windows.h>
 # include <sys/stat.h>
@@ -74,7 +74,7 @@
        _timeout(5)
 {
     //GNASH_REPORT_FUNCTION;
-#ifdef HAVE_WINSOCK_H
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
     WORD wVersionRequested;
     WSADATA wsaData;
     wVersionRequested = MAKEWORD(1, 1);                // Windows Sockets 1.1
@@ -89,7 +89,7 @@
 Network::~Network()
 {
     //GNASH_REPORT_FUNCTION;
-#ifdef HAVE_WINSOCK_H
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
     WSACleanup();
 #else
     closeNet();

Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/network.h   7 Jul 2007 12:02:45 -0000       1.19
+++ libbase/network.h   10 Aug 2007 14:06:35 -0000      1.20
@@ -26,7 +26,7 @@
 
 #include <string>
 
-#ifndef HAVE_WINSOCK_H
+#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
 # include <netinet/in.h>
 # include <arpa/inet.h>
 #else
@@ -46,7 +46,12 @@
 const short RTMPT = 80;
 const short RTMPTS = 443;
 
-#ifdef HAVE_WINSOCK_H
+#ifdef __OS2__
+       typedef int    socklen_t;
+       #define SHUT_RDWR 0x2
+#endif
+
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
        typedef long   in_addr_t;
 #      define inet_lnaof(x) inet_addr(inet_ntoa(x))
        typedef int    socklen_t;

Index: libbase/tu_config.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_config.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/tu_config.h 2 May 2007 18:19:02 -0000       1.15
+++ libbase/tu_config.h 10 Aug 2007 14:06:35 -0000      1.16
@@ -57,6 +57,16 @@
        #endif
 
        #define DSOLOCAL
+#elif defined(__OS2__)
+       #ifdef BUILDING_DLL
+               #define DSOEXPORT __declspec(dllexport)
+       #else
+               // Temporarily commented because of VC++ compiler problems 
+               #define DSOEXPORT // __declspec(dllimport)
+       #endif
+
+       #define DSOLOCAL
+
 #else
        #ifdef HAVE_GNUC_VISIBILITY
                #define DSOEXPORT __attribute__ ((visibility("default")))

Index: libbase/tu_timer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/tu_timer.cpp        19 May 2007 21:18:34 -0000      1.9
+++ libbase/tu_timer.cpp        10 Aug 2007 14:06:35 -0000      1.10
@@ -81,8 +81,10 @@
        gettimeofday(&tv, 0);
 
        uint64_t result = tv.tv_sec * 1000000;
+
        result += tv.tv_usec;
        // Time Unit: microsecond
+
        return result;
 }
 

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/shm.cpp      7 Jul 2007 12:02:45 -0000       1.33
+++ server/shm.cpp      10 Aug 2007 14:06:35 -0000      1.34
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: shm.cpp,v 1.33 2007/07/07 12:02:45 martinwguy Exp $ */
+/* $Id: shm.cpp,v 1.34 2007/08/10 14:06:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,11 +30,11 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <fcntl.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
-#elif !defined(__riscos__)
+#elif !defined(__riscos__) && !defined(__OS2__)
 #include <windows.h>
 #include <process.h>
 #include <io.h>

Index: server/shm.h
===================================================================
RCS file: /sources/gnash/gnash/server/shm.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/shm.h        7 Jul 2007 12:02:45 -0000       1.18
+++ server/shm.h        10 Aug 2007 14:06:36 -0000      1.19
@@ -32,10 +32,10 @@
 #include "as_object.h" // for inheritance
 
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
 # include <sys/ipc.h>
 # include <sys/shm.h>
-#elif !defined(__riscos__)
+#elif !defined(__riscos__) && !defined(__OS2__)
 # include <windows.h>
 # include <process.h>
 # include <fcntl.h>
@@ -90,7 +90,7 @@
     long        _alloced;
     size_t      _size;
     char        _filespec[MAX_SHM_NAME_SIZE];
-#ifndef HAVE_WINSOCK_H
+#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
     key_t      _shmkey;
 #else
     long       _shmkey;

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- server/vm/ASHandlers.cpp    6 Aug 2007 20:42:57 -0000       1.118
+++ server/vm/ASHandlers.cpp    10 Aug 2007 14:06:36 -0000      1.119
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.118 2007/08/06 20:42:57 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.119 2007/08/10 14:06:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1887,7 +1887,18 @@
                                sendVarsMethod);
                }
 
+#ifndef __OS2__x
                string command = "firefox -remote \"openurl(";
+#else
+static char browserExe[ 255 ] = "";
+
+    if ( browserExe[0] == 0 ) {
+        PrfQueryProfileString( HINI_USER, (PSZ) "WPURLDEFAULTSETTINGS", (PSZ) 
"DefaultBrowserExe", NULL,
+                               (PVOID) browserExe, (LONG)sizeof(browserExe) );
+    }
+               string command = browserExe;
+               command += " -remote \"openurl(";
+#endif
                command += url.str();
 #if 0 // target testing
                if ( ! target_string.empty() )

Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- utilities/dumpshm.cpp       1 Jul 2007 10:55:16 -0000       1.12
+++ utilities/dumpshm.cpp       10 Aug 2007 14:06:36 -0000      1.13
@@ -20,7 +20,7 @@
 //
 
 
-/* $Id: dumpshm.cpp,v 1.12 2007/07/01 10:55:16 bjacques Exp $ */
+/* $Id: dumpshm.cpp,v 1.13 2007/08/10 14:06:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,6 +28,7 @@
 
 #include <stdarg.h>
 #include <sys/stat.h>
+
 extern "C"{
        #include <unistd.h>
 #ifdef HAVE_GETOPT_H
@@ -40,11 +41,11 @@
 }
 #include <dirent.h>
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
-#elif !defined(__riscos__)
+#elif !defined(__riscos__) && !defined(__OS2__)
 #include <windows.h>
 #include <process.h>
 #include <io.h>