From a92c46317601e0e7485dc1a4a8d7756250670b1e Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Tue, 25 Apr 2000 02:05:08 +0000 Subject: [PATCH] Build fixes for BeOS. Bug 36924 & bug 36926. Thanks to Justin Morey for the patches. git-svn-id: svn://10.0.0.236/trunk@67039 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/browser/Makefile.in | 6 +- mozilla/modules/plugin/base/src/Makefile.in | 9 +- .../plugin/base/src/nsPluginsDirBeOS.cpp | 232 ++++++++++++++++++ mozilla/modules/plugin/nglsrc/Makefile.in | 9 +- .../plugin/nglsrc/nsPluginsDirBeOS.cpp | 232 ++++++++++++++++++ 5 files changed, 485 insertions(+), 3 deletions(-) create mode 100644 mozilla/modules/plugin/base/src/nsPluginsDirBeOS.cpp create mode 100644 mozilla/modules/plugin/nglsrc/nsPluginsDirBeOS.cpp diff --git a/mozilla/embedding/browser/Makefile.in b/mozilla/embedding/browser/Makefile.in index 4607310ae98..dbf56f49347 100644 --- a/mozilla/embedding/browser/Makefile.in +++ b/mozilla/embedding/browser/Makefile.in @@ -25,6 +25,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS=webBrowser setup build gtk +DIRS=webBrowser setup build + +ifdef MOZ_ENABLE_GTK +DIRS += gtk +endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index fa34715b8fe..5765aac9940 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -38,9 +38,14 @@ CPPSRCS = \ ns4xPlugin.cpp \ ns4xPluginInstance.cpp \ nsPluginInstancePeer.cpp \ - nsPluginsDirUNIX.cpp \ $(NULL) +ifeq ($(OS_ARCH), BeOS) + CPPSRCS += nsPluginsDirBeOS.cpp +else + CPPSRCS += nsPluginsDirUNIX.cpp +endif + EXPORTS = \ nsPluginsCID.h \ nsIPluginHost.h \ @@ -58,6 +63,7 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_PLUGIN +ifneq ($(OS_ARCH), BeOS) ifndef MOZ_MONOLITHIC_TOOLKIT CXXFLAGS += $(MOZ_GTK_CFLAGS) CFLAGS += $(MOZ_GTK_CFLAGS) @@ -67,3 +73,4 @@ CXXFLAGS += $(TK_CFLAGS) CFLAGS += $(TK_CFLAGS) EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt endif +endif diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirBeOS.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirBeOS.cpp new file mode 100644 index 00000000000..3cafe2d5fee --- /dev/null +++ b/mozilla/modules/plugin/base/src/nsPluginsDirBeOS.cpp @@ -0,0 +1,232 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + */ + +/* + nsPluginsDirBeOS.cpp + + BeOS implementation of the nsPluginsDir/nsPluginsFile classes. + + Based on nsPluginsDirUNIX.cpp r1.12 by Alex Musil + */ + +#include "nsPluginsDir.h" +#include "prlink.h" +#include "plstr.h" +#include "prmem.h" + +#include "nsSpecialSystemDirectory.h" + +/* Local helper functions */ + +static char* GetFileName(const char* pathname) +{ + const char* filename = nsnull; + + // this is most likely a path, so skip to the filename + filename = PL_strrchr(pathname, '/'); + if(filename) + ++filename; + else + filename = pathname; + + return PL_strdup(filename); +} + +static PRUint32 CalculateVariantCount(char* mimeTypes) +{ + PRUint32 variants = 0; + char* ptr = mimeTypes; + while (*ptr) + { + if (*ptr == ';') + variants++; + + ++ptr; + } + return variants; +} + +/////////////////////////////////////////////////////////////////////////// + +/* nsPluginsDir implementation */ + +nsPluginsDir::nsPluginsDir(PRUint16 location) +{ + // this is somewhat lacking, in that it doesn't fall back to any other directories. + // then again, I'm not sure we should be falling back at all. plugins have been (and probably + // should continue to be) loaded from both /plugins and ~/.mozilla/plugins. There + // doesn't seem to be any way to do this in the current nsPluginsDir code, which is disheartening. + // + + // use MOZILLA_FIVE_HOME/plugins + + nsSpecialSystemDirectory sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory); + sysdir += "plugins"; + const char *pluginsDir = sysdir.GetCString(); // native path + if (pluginsDir != NULL) + { + *(nsFileSpec*)this = pluginsDir; + } +} + +nsPluginsDir::~nsPluginsDir() +{ + // do nothing +} + +PRBool nsPluginsDir::IsPluginFile(const nsFileSpec& fileSpec) +{ + const char* pathname = fileSpec.GetCString(); + +#ifdef NS_DEBUG + printf("IsPluginFile(%s)\n", pathname); +#endif + + return PR_TRUE; +} + +/////////////////////////////////////////////////////////////////////////// + +/* nsPluginFile implementation */ + +nsPluginFile::nsPluginFile(const nsFileSpec& spec) + : nsFileSpec(spec) +{ + // nada +} + +nsPluginFile::~nsPluginFile() +{ + // nada +} + +/** + * Loads the plugin into memory using NSPR's shared-library loading + * mechanism. Handles platform differences in loading shared libraries. + */ +nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary) +{ + const char* path = this->GetCString(); + pLibrary = outLibrary = PR_LoadLibrary(path); + +#ifdef NS_DEBUG + printf("LoadPlugin() %s returned %lx\n",path,(unsigned long)pLibrary); +#endif + + return NS_OK; +} + +typedef char* (*BeOS_Plugin_GetMIMEDescription)(); + + +/** + * Obtains all of the information currently available for this plugin. + */ +nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info) +{ + const char *path = this->GetCString(); + char *mimedescr,*mdesc,*start,*nexttoc,*mtype,*exten,*descr; + int i,num; + + BeOS_Plugin_GetMIMEDescription procedure = nsnull; + mimedescr=(char *)""; + + if((procedure = (BeOS_Plugin_GetMIMEDescription)PR_FindSymbol(pLibrary,"NP_GetMIMEDescription")) != 0) { + mimedescr = procedure(); + } else { +#ifdef NS_DEBUG + printf("Cannot get plugin info: no GetMIMEDescription procedure!\n"); +#endif + return NS_ERROR_FAILURE; + } + + info.fName = GetFileName(path); + +#ifdef NS_DEBUG + printf("GetMIMEDescription() %lx returned \"%s\"\n", + (unsigned long)procedure, mimedescr); +#endif + + // copy string + + mdesc = (char *)PR_Malloc(strlen(mimedescr)+1); + strcpy(mdesc,mimedescr); + num=CalculateVariantCount(mimedescr)+1; + info.fVariantCount = num; + + info.fMimeTypeArray =(char **)PR_Malloc(num * sizeof(char *)); + info.fMimeDescriptionArray =(char **)PR_Malloc(num * sizeof(char *)); + info.fExtensionArray =(char **)PR_Malloc(num * sizeof(char *)); + + start=mdesc; + for(i=0;i/plugins and ~/.mozilla/plugins. There + // doesn't seem to be any way to do this in the current nsPluginsDir code, which is disheartening. + // + + // use MOZILLA_FIVE_HOME/plugins + + nsSpecialSystemDirectory sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory); + sysdir += "plugins"; + const char *pluginsDir = sysdir.GetCString(); // native path + if (pluginsDir != NULL) + { + *(nsFileSpec*)this = pluginsDir; + } +} + +nsPluginsDir::~nsPluginsDir() +{ + // do nothing +} + +PRBool nsPluginsDir::IsPluginFile(const nsFileSpec& fileSpec) +{ + const char* pathname = fileSpec.GetCString(); + +#ifdef NS_DEBUG + printf("IsPluginFile(%s)\n", pathname); +#endif + + return PR_TRUE; +} + +/////////////////////////////////////////////////////////////////////////// + +/* nsPluginFile implementation */ + +nsPluginFile::nsPluginFile(const nsFileSpec& spec) + : nsFileSpec(spec) +{ + // nada +} + +nsPluginFile::~nsPluginFile() +{ + // nada +} + +/** + * Loads the plugin into memory using NSPR's shared-library loading + * mechanism. Handles platform differences in loading shared libraries. + */ +nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary) +{ + const char* path = this->GetCString(); + pLibrary = outLibrary = PR_LoadLibrary(path); + +#ifdef NS_DEBUG + printf("LoadPlugin() %s returned %lx\n",path,(unsigned long)pLibrary); +#endif + + return NS_OK; +} + +typedef char* (*BeOS_Plugin_GetMIMEDescription)(); + + +/** + * Obtains all of the information currently available for this plugin. + */ +nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info) +{ + const char *path = this->GetCString(); + char *mimedescr,*mdesc,*start,*nexttoc,*mtype,*exten,*descr; + int i,num; + + BeOS_Plugin_GetMIMEDescription procedure = nsnull; + mimedescr=(char *)""; + + if((procedure = (BeOS_Plugin_GetMIMEDescription)PR_FindSymbol(pLibrary,"NP_GetMIMEDescription")) != 0) { + mimedescr = procedure(); + } else { +#ifdef NS_DEBUG + printf("Cannot get plugin info: no GetMIMEDescription procedure!\n"); +#endif + return NS_ERROR_FAILURE; + } + + info.fName = GetFileName(path); + +#ifdef NS_DEBUG + printf("GetMIMEDescription() %lx returned \"%s\"\n", + (unsigned long)procedure, mimedescr); +#endif + + // copy string + + mdesc = (char *)PR_Malloc(strlen(mimedescr)+1); + strcpy(mdesc,mimedescr); + num=CalculateVariantCount(mimedescr)+1; + info.fVariantCount = num; + + info.fMimeTypeArray =(char **)PR_Malloc(num * sizeof(char *)); + info.fMimeDescriptionArray =(char **)PR_Malloc(num * sizeof(char *)); + info.fExtensionArray =(char **)PR_Malloc(num * sizeof(char *)); + + start=mdesc; + for(i=0;i