diff --git a/mozilla/build/mac/build_scripts/MozillaBuildList.pm b/mozilla/build/mac/build_scripts/MozillaBuildList.pm index 8a007762be3..6328fdf7b4c 100644 --- a/mozilla/build/mac/build_scripts/MozillaBuildList.pm +++ b/mozilla/build/mac/build_scripts/MozillaBuildList.pm @@ -134,6 +134,8 @@ sub InstallDefaultsFiles() InstallResources(":mozilla:modules:libpref:src:MANIFEST_PREFS", "$default_pref_dir", 0); InstallResources(":mozilla:modules:libpref:src:init:MANIFEST", "$default_pref_dir", 0); InstallResources(":mozilla:modules:libpref:src:mac:MANIFEST", "$default_pref_dir", 0); + InstallResources(":mozilla:netwerk:base:public:MANIFEST_PREFS", "$default_pref_dir", 0); + if ($main::options{inspector}) { InstallResources(":mozilla:extensions:inspector:resources:content:prefs:MANIFEST", "$default_pref_dir", 0); @@ -569,13 +571,20 @@ sub BuildClientDist() InstallFromManifest(":mozilla:modules:libimg:public:MANIFEST", "$distdirectory:libimg:"); InstallFromManifest(":mozilla:modules:libimg:public_com:MANIFEST", "$distdirectory:libimg:"); + if ($main::options{useimg2}) { + #GFX2 + InstallFromManifest(":mozilla:gfx2:public:MANIFEST", "$distdirectory:gfx2:"); + InstallFromManifest(":mozilla:gfx2:public:MANIFEST_IDL", "$distdirectory:idl:"); + + #LIBIMG2 + InstallFromManifest(":mozilla:modules:libpr0n:public:MANIFEST_IDL", "$distdirectory:libimg2:"); + } + #PLUGIN InstallFromManifest(":mozilla:modules:plugin:nglsrc:MANIFEST", "$distdirectory:plugin:"); InstallFromManifest(":mozilla:modules:plugin:public:MANIFEST", "$distdirectory:plugin:"); - InstallFromManifest(":mozilla:modules:plugin:public:MANIFEST_IDL", "$distdirectory:idl:"); InstallFromManifest(":mozilla:modules:oji:src:MANIFEST", "$distdirectory:oji:"); InstallFromManifest(":mozilla:modules:oji:public:MANIFEST", "$distdirectory:oji:"); - InstallFromManifest(":mozilla:modules:oji:public:MANIFEST_IDL", "$distdirectory:idl:"); #DB InstallFromManifest(":mozilla:db:mdb:public:MANIFEST", "$distdirectory:db:"); @@ -978,11 +987,18 @@ sub BuildIDLProjects() if ($main::options{psm2}) { BuildIDLProject(":mozilla:security:manager:ssl:macbuild:pipnssIDL.mcp", "pipnss"); + BuildIDLProject(":mozilla:security:manager:pki:macbuild:pippkiIDL.mcp", "pippki"); } BuildIDLProject(":mozilla:modules:libpref:macbuild:libprefIDL.mcp", "libpref"); BuildIDLProject(":mozilla:modules:libutil:macbuild:libutilIDL.mcp", "libutil"); BuildIDLProject(":mozilla:modules:libjar:macbuild:libjarIDL.mcp", "libjar"); + + if ($main::options{useimg2}) { + BuildIDLProject(":mozilla:gfx2:macbuild:gfx2IDL.mcp", "gfx2"); + BuildIDLProject(":mozilla:modules:libpr0n:macbuild:libimg2IDL.mcp", "libimg2"); + } + BuildIDLProject(":mozilla:modules:plugin:macbuild:pluginIDL.mcp", "plugin"); BuildIDLProject(":mozilla:modules:oji:macbuild:ojiIDL.mcp", "oji"); BuildIDLProject(":mozilla:js:macbuild:XPConnectIDL.mcp", "xpconnect"); @@ -1221,6 +1237,37 @@ sub BuildImglibProjects() EndBuildModule("imglib"); } # imglib +#//-------------------------------------------------------------------------------------------------- +#// Build libimg2 projects +#//-------------------------------------------------------------------------------------------------- + +sub BuildImglib2Projects() +{ + unless( $main::build{libimg2} ) { return; } + + # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project + my($D) = $main::DEBUG ? "Debug" : ""; + + StartBuildModule("libimg2"); + + if ($main::options{useimg2}) + { + BuildOneProject(":mozilla:gfx2:macbuild:gfx2.mcp", "gfx2$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:modules:libpr0n:macbuild:libimg2.mcp", "libimg2$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:modules:libpr0n:macbuild:pngdecoder2.mcp", "pngdecoder2$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:modules:libpr0n:macbuild:gifdecoder2.mcp", "gifdecoder2$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:modules:libpr0n:macbuild:jpegdecoder2.mcp", "jpegdecoder2$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + + # MNG + if ($main::options{mng}) + { + #BuildOneProject(":mozilla:modules:libimg:macbuild:mng.mcp", "mng$D.o", 0, 0, 0); + #BuildOneProject(":mozilla:modules:libimg:macbuild:mngdecoder.mcp", "mngdecoder$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + } + } + + EndBuildModule("libimg2"); +} # imglib2 #//-------------------------------------------------------------------------------------------------- #// Build international projects @@ -1412,7 +1459,7 @@ sub BuildLayoutProjects() my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime; # localtime returns year minus 1900 $year = $year + 1900; - printf(OUTPUT "#define PRODUCT_VERSION \"%04d%02d%02d\"\n", $year, 1+$mon, $mday); + printf(OUTPUT "#define PRODUCT_VERSION NS_LITERAL_STRING(\"%04d%02d%02d\").get()\n", $year, 1+$mon, $mday); close(OUTPUT); #// @@ -1617,8 +1664,15 @@ sub BuildExtensionsProjects() # LDAP Client if ($main::options{ldap}) { + my($experi) = $main::options{ldap_experimental} ? " experi" : ""; + BuildOneProject(":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient.mcp", "LDAPClient$D.shlb", 1, $main::ALIAS_SYM_FILES, 0); - BuildOneProject(":mozilla:directory:xpcom:macbuild:mozldap.mcp", "mozldap$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProjectWithOutput(":mozilla:directory:xpcom:macbuild:mozldap.mcp", "mozldap$D.shlb$experi", "mozldap$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + + if ($main::options{ldap_experimental}) + { + InstallResources(":mozilla:extensions:directory:xpcom:datasource:MANIFEST_COMPONENTS", "${dist_dir}Components"); + } } # XML Extras @@ -1849,6 +1903,7 @@ sub BuildProjects() BuildRuntimeProjects(); BuildCommonProjects(); BuildImglibProjects(); + BuildImglib2Projects(); BuildNeckoProjects(); BuildSecurityProjects(); BuildBrowserUtilsProjects(); diff --git a/mozilla/modules/oji/macbuild/ojiIDL.mcp b/mozilla/modules/oji/macbuild/ojiIDL.mcp index db067037cc9..c8fc381e0ef 100644 Binary files a/mozilla/modules/oji/macbuild/ojiIDL.mcp and b/mozilla/modules/oji/macbuild/ojiIDL.mcp differ diff --git a/mozilla/modules/oji/public/MANIFEST b/mozilla/modules/oji/public/MANIFEST index 42aa04c4476..c79ddc3a845 100644 --- a/mozilla/modules/oji/public/MANIFEST +++ b/mozilla/modules/oji/public/MANIFEST @@ -1 +1,38 @@ -# # 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): # # # This is a list of local files which get copied to the mozilla:dist directory # nsIJRIPlugin.h nsIJVMConsole.h nsIJVMPlugin.h #nsIJVMPluginInstance.h nsIJVMPluginTagInfo.h nsISymantecDebugger.h nsISymantecDebugManager.h nsjvm.h nsISecureEnv.h ProxyJNI.h nsIThreadManager.h nsIJVMWindow.h nsILiveConnectManager.h \ No newline at end of file +# +# 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): +# + +# +# This is a list of local files which get copied to the mozilla:dist directory +# + +nsIJRIPlugin.h +nsIJVMConsole.h +nsIJVMPlugin.h +nsIJVMPluginInstance.h +nsIJVMPluginTagInfo.h +nsISymantecDebugger.h +nsISymantecDebugManager.h +nsjvm.h +nsISecureEnv.h +ProxyJNI.h +nsIThreadManager.h +nsIJVMWindow.h +nsILiveConnectManager.h diff --git a/mozilla/modules/oji/public/MANIFEST_IDL b/mozilla/modules/oji/public/MANIFEST_IDL deleted file mode 100644 index 35990f3fbef..00000000000 --- a/mozilla/modules/oji/public/MANIFEST_IDL +++ /dev/null @@ -1 +0,0 @@ -# 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): # # This is a list of local files which get copied to the mozilla:dist:??? directory # nsIJVMPluginInstance.idl \ No newline at end of file diff --git a/mozilla/modules/oji/public/Makefile.in b/mozilla/modules/oji/public/Makefile.in index bcd440ddbb8..b7198e4a0a4 100644 --- a/mozilla/modules/oji/public/Makefile.in +++ b/mozilla/modules/oji/public/Makefile.in @@ -28,16 +28,14 @@ include $(DEPTH)/config/autoconf.mk MODULE = oji -XPIDLSRCS = \ - nsIJVMManager.idl \ - nsIJVMPluginInstance.idl \ - $(NULL) +XPIDLSRCS = nsIJVMManager.idl EXPORTS = \ nsjvm.h \ nsIJRIPlugin.h \ nsIJVMConsole.h \ nsIJVMPlugin.h \ + nsIJVMPluginInstance.h \ nsIJVMPluginTagInfo.h \ nsIJVMPrefsWindow.h \ nsIJVMWindow.h \ diff --git a/mozilla/modules/oji/public/makefile.win b/mozilla/modules/oji/public/makefile.win index 6855d5955a6..34d085d08e7 100644 --- a/mozilla/modules/oji/public/makefile.win +++ b/mozilla/modules/oji/public/makefile.win @@ -27,7 +27,6 @@ MODULE = oji XPIDLSRCS = \ .\nsIJVMManager.idl \ - .\nsIJVMPluginInstance.idl \ $(NULL) EXPORTS = \ @@ -35,6 +34,7 @@ EXPORTS = \ nsIJRIPlugin.h \ nsIJVMConsole.h \ nsIJVMPlugin.h \ + nsIJVMPluginInstance.h \ nsIJVMPluginTagInfo.h \ nsIJVMPrefsWindow.h \ nsIJVMWindow.h \ diff --git a/mozilla/modules/oji/public/nsIJVMPluginInstance.idl b/mozilla/modules/oji/public/nsIJVMPluginInstance.idl deleted file mode 100644 index 860020e17c9..00000000000 --- a/mozilla/modules/oji/public/nsIJVMPluginInstance.idl +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- 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): - */ - -//////////////////////////////////////////////////////////////////////////////// -// NETSCAPE JAVA VM PLUGIN EXTENSIONS -// -// This interface allows a Java virtual machine to be plugged into -// Communicator to implement the APPLET tag and host applets. -// -// Note that this is the C++ interface that the plugin sees. The browser -// uses a specific implementation of this, nsJVMPlugin, found in jvmmgr.h. -//////////////////////////////////////////////////////////////////////////////// - -#include "nsISupports.idl" -%{C++ -#include "jni.h" -%} - -native jobject(jobject); -native nChar(const char **); - -[scriptable, uuid(a0c057d0-01c1-11d2-815b-006008119d7a)] -interface nsIJVMPluginInstance : nsISupports { - - // This method is called when LiveConnect wants to find the Java object - // associated with this plugin instance, e.g. the Applet or JavaBean object. - [noscript] void GetJavaObject(out jobject result); - - [noscript] void GetText(in nChar result); -}; diff --git a/mozilla/modules/plugin/base/macbuild/pluginIDL.mcp b/mozilla/modules/plugin/base/macbuild/pluginIDL.mcp index 59ec0117431..8250895cfb3 100644 Binary files a/mozilla/modules/plugin/base/macbuild/pluginIDL.mcp and b/mozilla/modules/plugin/base/macbuild/pluginIDL.mcp differ diff --git a/mozilla/modules/plugin/base/public/MANIFEST b/mozilla/modules/plugin/base/public/MANIFEST index 9fa86b324a7..24f9166e213 100644 --- a/mozilla/modules/plugin/base/public/MANIFEST +++ b/mozilla/modules/plugin/base/public/MANIFEST @@ -1 +1,52 @@ -# # 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): # # # This is a list of local files which get copied to the mozilla:dist directory # nsIEventHandler.h nsIFileUtilities.h nsIJRILiveConnectPlugin.h nsIJRILiveConnectPlugInstPeer.h nsILiveConnectPlugin.h nsILiveConnectPlugInstPeer.h nsIMalloc.h nsIPlugin.h nsIPluginInstance.h nsIPluginInstancePeer.h nsIPluginInstancePeer2.h #nsIPluginManager.h nsIPluginManager2.h nsIPluginStream.h nsIPluginStreamPeer.h nsIPluginStreamPeer2.h nsIPluginTagInfo.h nsIPluginTagInfo2.h nsISeekablePluginStreamPeer.h nsIWindowlessPlugInstPeer.h nsplugin.h nsplugindefs.h nsICookieStorage.h nsIPluginStreamListener.h nsIPluginStreamInfo.h nsIPluginInputStream.h nsIPluginInputStream2.h \ No newline at end of file +# +# 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): +# + +# +# This is a list of local files which get copied to the mozilla:dist directory +# + +nsIEventHandler.h +nsIFileUtilities.h +nsIJRILiveConnectPlugin.h +nsIJRILiveConnectPlugInstPeer.h +nsILiveConnectPlugin.h +nsILiveConnectPlugInstPeer.h +nsIMalloc.h +nsIPlugin.h +nsIPluginInstance.h +nsIPluginInstancePeer.h +nsIPluginInstancePeer2.h +nsIPluginManager.h +nsIPluginManager2.h +nsIPluginStream.h +nsIPluginStreamPeer.h +nsIPluginStreamPeer2.h +nsIPluginTagInfo.h +nsIPluginTagInfo2.h +nsISeekablePluginStreamPeer.h +nsIWindowlessPlugInstPeer.h +nsplugin.h +nsplugindefs.h +nsICookieStorage.h +nsIPluginStreamListener.h +nsIPluginStreamInfo.h +nsIPluginInputStream.h +nsIPluginInputStream2.h diff --git a/mozilla/modules/plugin/base/public/MANIFEST_IDL b/mozilla/modules/plugin/base/public/MANIFEST_IDL deleted file mode 100644 index aeceded046a..00000000000 --- a/mozilla/modules/plugin/base/public/MANIFEST_IDL +++ /dev/null @@ -1 +0,0 @@ -# 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): # # This is a list of local files which get copied to the mozilla:dist:??? directory # nsIPluginManager.idl \ No newline at end of file diff --git a/mozilla/modules/plugin/base/public/Makefile.in b/mozilla/modules/plugin/base/public/Makefile.in index 3d092679617..86b1b035ac1 100644 --- a/mozilla/modules/plugin/base/public/Makefile.in +++ b/mozilla/modules/plugin/base/public/Makefile.in @@ -40,6 +40,7 @@ EXPORTS = \ nsIPluginInstance.h \ nsIPluginInstancePeer.h \ nsIPluginInstancePeer2.h \ + nsIPluginManager.h \ nsIPluginManager2.h \ nsIPluginStream.h \ nsIPluginTagInfo.h \ @@ -65,7 +66,6 @@ EXPORTS += \ XPIDLSRCS = \ nsIScriptablePlugin.idl \ nsIHTTPHeaderListener.idl \ - nsIPluginManager.idl \ $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/modules/plugin/base/public/makefile.win b/mozilla/modules/plugin/base/public/makefile.win index ab4ae68820c..e2bb43b0f22 100644 --- a/mozilla/modules/plugin/base/public/makefile.win +++ b/mozilla/modules/plugin/base/public/makefile.win @@ -27,8 +27,9 @@ EXPORTS = \ nsIMalloc.h \ nsIPlugin.h \ nsIPluginInstance.h \ - nsIPluginInstancePeer.h \ - nsIPluginInstancePeer2.h \ + nsIPluginInstancePeer.h \ + nsIPluginInstancePeer2.h \ + nsIPluginManager.h \ nsIPluginManager2.h \ nsIPluginTagInfo.h \ nsIPluginTagInfo2.h \ @@ -36,7 +37,7 @@ EXPORTS = \ nsIPluginStreamListener.h \ nsIPluginStreamInfo.h \ nsplugin.h \ - nsplugindefs.h \ + nsplugindefs.h \ nsICookieStorage.h # DEPRECATED -- remove before we ship 5.0 @@ -54,8 +55,7 @@ EXPORTS = $(EXPORTS) \ XPIDLSRCS = \ .\nsIScriptablePlugin.idl \ - .\nsIHTTPHeaderListener.idl \ - .\nsIPluginManager.idl \ + .\nsIHTTPHeaderListener.idl \ $(NULL) include <$(DEPTH)/config/rules.mak> diff --git a/mozilla/modules/plugin/base/public/nsIPluginManager.idl b/mozilla/modules/plugin/base/public/nsIPluginManager.idl index 31c3e0967c3..cf65633d6f5 100644 --- a/mozilla/modules/plugin/base/public/nsIPluginManager.idl +++ b/mozilla/modules/plugin/base/public/nsIPluginManager.idl @@ -35,52 +35,17 @@ */ //////////////////////////////////////////////////////////////////////////////// -#include "nsISupports.idl" -%{C++ -#include "nsplugindefs.h" -%} +#include "nsPluginDefs.idl" -// CLSID for the browser's global plugin manager object. -%{C++ -#define NS_PLUGINMANAGER_CID \ -{ /* ce768990-5a4e-11d2-8164-006008119d7a */ \ - 0xce768990, \ - 0x5a4e, \ - 0x11d2, \ - {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} -%} - -interface nsIPluginStreamListener; -native nsPluginManagerVariable(nsPluginManagerVariable); -native REFNSIID(REFNSIID); -native nativeVoid(void *); -native nativeChar(const char * *); - -[scriptable, uuid(da58ad80-4eb6-11d2-8164-006008119d7a)] - -/* +/** * The nsIPluginManager interface defines the minimum set of functionality that * the browser will support if it allows plugins. Plugins can call QueryInterface * to determine if a plugin manager implements more specific APIs or other * browser interfaces for the plugin to use (e.g. nsINetworkManager). */ - +[scriptable, uuid(a268450e-2df8-11d4-8cf4-0060b0fc14a3)] interface nsIPluginManager : nsISupports { - - /** - * Returns the value of a variable associated with the plugin manager. - * - * (Corresponds to NPN_GetValue.) - * - * @param variable - the plugin manager variable to get - * @param value - the address of where to store the resulting value - * @result - NS_OK if this operation was successful - */ - [noscript] void GetValue(in nsPluginManagerVariable variable, - in nativeVoid value); - /** * Causes the plugins directory to be searched again for new plugin * libraries. @@ -97,9 +62,9 @@ interface nsIPluginManager : nsISupports * * (Corresponds to NPN_UserAgent.) * - * @param resultingAgentString - the resulting user agent string + * @result - the resulting user agent string */ - [noscript] void UserAgent(in nativeChar resultingAgentString); + readonly attribute string userAgent; /** * Fetches a URL. @@ -122,16 +87,13 @@ interface nsIPluginManager : nsISupports * specify PR_FALSE) * @result - NS_OK if this operation was successful */ -%{C++ - NS_IMETHOD - GetURL(nsISupports* pluginInst, - const char* url, - const char* target = NULL, - nsIPluginStreamListener* streamListener = NULL, - const char* altHost = NULL, - const char* referrer = NULL, - PRBool forceJSEnabled = PR_FALSE) = 0; -%} + void getURL(in nsISupports pluginInst, + in wstring url, + in wstring target, + in nsIPluginStreamListener streamListener, + in wstring altHost, + in wstring referrer, + in boolean forceJSEnabled); /** * Posts to a URL with post data and/or post headers. @@ -158,91 +120,20 @@ interface nsIPluginManager : nsISupports * URLs, even if the user currently has JavaScript disabled (usually * specify PR_FALSE) * @param postHeadersLength - the length of postHeaders (if non-NULL) - * @param postHeaders - the headers to POST. Must be in the form of - * "HeaderName: HeaderValue\r\n". Each header, including the last, - * must be followed by "\r\n". NULL specifies that there are no - * post headers + * @param postHeaders - the headers to POST. NULL specifies that there + * are no post headers * @result - NS_OK if this operation was successful */ -%{C++ - NS_IMETHOD - PostURL(nsISupports* pluginInst, - const char* url, - PRUint32 postDataLen, - const char* postData, - PRBool isFile = PR_FALSE, - const char* target = NULL, - nsIPluginStreamListener* streamListener = NULL, - const char* altHost = NULL, - const char* referrer = NULL, - PRBool forceJSEnabled = PR_FALSE, - PRUint32 postHeadersLength = 0, - const char* postHeaders = NULL) = 0; -%} - - /** - * Persistently register a plugin with the plugin - * manager. aMimeTypes, aMimeDescriptions, and aFileExtensions are - * parallel arrays that contain information about the MIME types - * that the plugin supports. - * - * @param aCID - the plugin's CID - * @param aPluginName - the plugin's name - * @param aDescription - a description of the plugin - * @param aMimeTypes - an array of MIME types that the plugin - * is prepared to handle - * @param aMimeDescriptions - an array of descriptions for the - * MIME types that the plugin can handle. - * @param aFileExtensions - an array of file extensions for - * the MIME types that the plugin can handle. - * @param aCount - the number of elements in the aMimeTypes, - * aMimeDescriptions, and aFileExtensions arrays. - * @result - NS_OK if the operation was successful. - */ - [noscript] void RegisterPlugin(in REFNSIID aCID, - in string aPluginName, - in string aDescription, - in nativeChar aMimeTypes, - in nativeChar aMimeDescriptions, - in nativeChar aFileExtensions, - in long aCount); - - /** - * Unregister a plugin from the plugin manager - * - * @param aCID the CID of the plugin to unregister. - * @result - NS_OK if the operation was successful. - */ - [noscript] void UnregisterPlugin(in REFNSIID aCID); - - /** - * Fetches a URL, with Headers - - * @see GetURL. Identical except for additional params headers and - * headersLen - - * @param getHeadersLength - the length of getHeaders (if non-NULL) - - * @param getHeaders - the headers to GET. Must be in the form of - * "HeaderName: HeaderValue\r\n". Each header, including the last, - * must be followed by "\r\n". NULL specifies that there are no - * get headers - - * @result - NS_OK if this operation was successful - - */ -%{C++ - NS_IMETHOD - GetURLWithHeaders(nsISupports* pluginInst, - const char* url, - const char* target = NULL, - nsIPluginStreamListener* streamListener = NULL, - const char* altHost = NULL, - const char* referrer = NULL, - PRBool forceJSEnabled = PR_FALSE, - PRUint32 getHeadersLength = 0, - const char* getHeaders = NULL) = 0; -%} - + void postURL(in nsISupports pluginInst, + in wstring url, + in unsigned long postDataLen, + in string postData, // XXX wstring? + in unsigned long postHeadersLength, + in string postHeaders, // XXX wstring? + in boolean isFile, + in wstring target, + in nsIPluginStreamListener streamListener, + in wstring altHost, + in wstring referrer, + in boolean forceJSEnabled); }; - diff --git a/mozilla/modules/plugin/macbuild/pluginIDL.mcp b/mozilla/modules/plugin/macbuild/pluginIDL.mcp index 59ec0117431..8250895cfb3 100644 Binary files a/mozilla/modules/plugin/macbuild/pluginIDL.mcp and b/mozilla/modules/plugin/macbuild/pluginIDL.mcp differ diff --git a/mozilla/modules/plugin/public/MANIFEST b/mozilla/modules/plugin/public/MANIFEST index 9fa86b324a7..24f9166e213 100644 --- a/mozilla/modules/plugin/public/MANIFEST +++ b/mozilla/modules/plugin/public/MANIFEST @@ -1 +1,52 @@ -# # 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): # # # This is a list of local files which get copied to the mozilla:dist directory # nsIEventHandler.h nsIFileUtilities.h nsIJRILiveConnectPlugin.h nsIJRILiveConnectPlugInstPeer.h nsILiveConnectPlugin.h nsILiveConnectPlugInstPeer.h nsIMalloc.h nsIPlugin.h nsIPluginInstance.h nsIPluginInstancePeer.h nsIPluginInstancePeer2.h #nsIPluginManager.h nsIPluginManager2.h nsIPluginStream.h nsIPluginStreamPeer.h nsIPluginStreamPeer2.h nsIPluginTagInfo.h nsIPluginTagInfo2.h nsISeekablePluginStreamPeer.h nsIWindowlessPlugInstPeer.h nsplugin.h nsplugindefs.h nsICookieStorage.h nsIPluginStreamListener.h nsIPluginStreamInfo.h nsIPluginInputStream.h nsIPluginInputStream2.h \ No newline at end of file +# +# 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): +# + +# +# This is a list of local files which get copied to the mozilla:dist directory +# + +nsIEventHandler.h +nsIFileUtilities.h +nsIJRILiveConnectPlugin.h +nsIJRILiveConnectPlugInstPeer.h +nsILiveConnectPlugin.h +nsILiveConnectPlugInstPeer.h +nsIMalloc.h +nsIPlugin.h +nsIPluginInstance.h +nsIPluginInstancePeer.h +nsIPluginInstancePeer2.h +nsIPluginManager.h +nsIPluginManager2.h +nsIPluginStream.h +nsIPluginStreamPeer.h +nsIPluginStreamPeer2.h +nsIPluginTagInfo.h +nsIPluginTagInfo2.h +nsISeekablePluginStreamPeer.h +nsIWindowlessPlugInstPeer.h +nsplugin.h +nsplugindefs.h +nsICookieStorage.h +nsIPluginStreamListener.h +nsIPluginStreamInfo.h +nsIPluginInputStream.h +nsIPluginInputStream2.h diff --git a/mozilla/modules/plugin/public/MANIFEST_IDL b/mozilla/modules/plugin/public/MANIFEST_IDL deleted file mode 100644 index aeceded046a..00000000000 --- a/mozilla/modules/plugin/public/MANIFEST_IDL +++ /dev/null @@ -1 +0,0 @@ -# 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): # # This is a list of local files which get copied to the mozilla:dist:??? directory # nsIPluginManager.idl \ No newline at end of file diff --git a/mozilla/modules/plugin/public/Makefile.in b/mozilla/modules/plugin/public/Makefile.in index 3d092679617..86b1b035ac1 100644 --- a/mozilla/modules/plugin/public/Makefile.in +++ b/mozilla/modules/plugin/public/Makefile.in @@ -40,6 +40,7 @@ EXPORTS = \ nsIPluginInstance.h \ nsIPluginInstancePeer.h \ nsIPluginInstancePeer2.h \ + nsIPluginManager.h \ nsIPluginManager2.h \ nsIPluginStream.h \ nsIPluginTagInfo.h \ @@ -65,7 +66,6 @@ EXPORTS += \ XPIDLSRCS = \ nsIScriptablePlugin.idl \ nsIHTTPHeaderListener.idl \ - nsIPluginManager.idl \ $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/modules/plugin/public/makefile.win b/mozilla/modules/plugin/public/makefile.win index ab4ae68820c..e2bb43b0f22 100644 --- a/mozilla/modules/plugin/public/makefile.win +++ b/mozilla/modules/plugin/public/makefile.win @@ -27,8 +27,9 @@ EXPORTS = \ nsIMalloc.h \ nsIPlugin.h \ nsIPluginInstance.h \ - nsIPluginInstancePeer.h \ - nsIPluginInstancePeer2.h \ + nsIPluginInstancePeer.h \ + nsIPluginInstancePeer2.h \ + nsIPluginManager.h \ nsIPluginManager2.h \ nsIPluginTagInfo.h \ nsIPluginTagInfo2.h \ @@ -36,7 +37,7 @@ EXPORTS = \ nsIPluginStreamListener.h \ nsIPluginStreamInfo.h \ nsplugin.h \ - nsplugindefs.h \ + nsplugindefs.h \ nsICookieStorage.h # DEPRECATED -- remove before we ship 5.0 @@ -54,8 +55,7 @@ EXPORTS = $(EXPORTS) \ XPIDLSRCS = \ .\nsIScriptablePlugin.idl \ - .\nsIHTTPHeaderListener.idl \ - .\nsIPluginManager.idl \ + .\nsIHTTPHeaderListener.idl \ $(NULL) include <$(DEPTH)/config/rules.mak> diff --git a/mozilla/modules/plugin/public/nsIPluginManager.idl b/mozilla/modules/plugin/public/nsIPluginManager.idl index 31c3e0967c3..cf65633d6f5 100644 --- a/mozilla/modules/plugin/public/nsIPluginManager.idl +++ b/mozilla/modules/plugin/public/nsIPluginManager.idl @@ -35,52 +35,17 @@ */ //////////////////////////////////////////////////////////////////////////////// -#include "nsISupports.idl" -%{C++ -#include "nsplugindefs.h" -%} +#include "nsPluginDefs.idl" -// CLSID for the browser's global plugin manager object. -%{C++ -#define NS_PLUGINMANAGER_CID \ -{ /* ce768990-5a4e-11d2-8164-006008119d7a */ \ - 0xce768990, \ - 0x5a4e, \ - 0x11d2, \ - {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} -%} - -interface nsIPluginStreamListener; -native nsPluginManagerVariable(nsPluginManagerVariable); -native REFNSIID(REFNSIID); -native nativeVoid(void *); -native nativeChar(const char * *); - -[scriptable, uuid(da58ad80-4eb6-11d2-8164-006008119d7a)] - -/* +/** * The nsIPluginManager interface defines the minimum set of functionality that * the browser will support if it allows plugins. Plugins can call QueryInterface * to determine if a plugin manager implements more specific APIs or other * browser interfaces for the plugin to use (e.g. nsINetworkManager). */ - +[scriptable, uuid(a268450e-2df8-11d4-8cf4-0060b0fc14a3)] interface nsIPluginManager : nsISupports { - - /** - * Returns the value of a variable associated with the plugin manager. - * - * (Corresponds to NPN_GetValue.) - * - * @param variable - the plugin manager variable to get - * @param value - the address of where to store the resulting value - * @result - NS_OK if this operation was successful - */ - [noscript] void GetValue(in nsPluginManagerVariable variable, - in nativeVoid value); - /** * Causes the plugins directory to be searched again for new plugin * libraries. @@ -97,9 +62,9 @@ interface nsIPluginManager : nsISupports * * (Corresponds to NPN_UserAgent.) * - * @param resultingAgentString - the resulting user agent string + * @result - the resulting user agent string */ - [noscript] void UserAgent(in nativeChar resultingAgentString); + readonly attribute string userAgent; /** * Fetches a URL. @@ -122,16 +87,13 @@ interface nsIPluginManager : nsISupports * specify PR_FALSE) * @result - NS_OK if this operation was successful */ -%{C++ - NS_IMETHOD - GetURL(nsISupports* pluginInst, - const char* url, - const char* target = NULL, - nsIPluginStreamListener* streamListener = NULL, - const char* altHost = NULL, - const char* referrer = NULL, - PRBool forceJSEnabled = PR_FALSE) = 0; -%} + void getURL(in nsISupports pluginInst, + in wstring url, + in wstring target, + in nsIPluginStreamListener streamListener, + in wstring altHost, + in wstring referrer, + in boolean forceJSEnabled); /** * Posts to a URL with post data and/or post headers. @@ -158,91 +120,20 @@ interface nsIPluginManager : nsISupports * URLs, even if the user currently has JavaScript disabled (usually * specify PR_FALSE) * @param postHeadersLength - the length of postHeaders (if non-NULL) - * @param postHeaders - the headers to POST. Must be in the form of - * "HeaderName: HeaderValue\r\n". Each header, including the last, - * must be followed by "\r\n". NULL specifies that there are no - * post headers + * @param postHeaders - the headers to POST. NULL specifies that there + * are no post headers * @result - NS_OK if this operation was successful */ -%{C++ - NS_IMETHOD - PostURL(nsISupports* pluginInst, - const char* url, - PRUint32 postDataLen, - const char* postData, - PRBool isFile = PR_FALSE, - const char* target = NULL, - nsIPluginStreamListener* streamListener = NULL, - const char* altHost = NULL, - const char* referrer = NULL, - PRBool forceJSEnabled = PR_FALSE, - PRUint32 postHeadersLength = 0, - const char* postHeaders = NULL) = 0; -%} - - /** - * Persistently register a plugin with the plugin - * manager. aMimeTypes, aMimeDescriptions, and aFileExtensions are - * parallel arrays that contain information about the MIME types - * that the plugin supports. - * - * @param aCID - the plugin's CID - * @param aPluginName - the plugin's name - * @param aDescription - a description of the plugin - * @param aMimeTypes - an array of MIME types that the plugin - * is prepared to handle - * @param aMimeDescriptions - an array of descriptions for the - * MIME types that the plugin can handle. - * @param aFileExtensions - an array of file extensions for - * the MIME types that the plugin can handle. - * @param aCount - the number of elements in the aMimeTypes, - * aMimeDescriptions, and aFileExtensions arrays. - * @result - NS_OK if the operation was successful. - */ - [noscript] void RegisterPlugin(in REFNSIID aCID, - in string aPluginName, - in string aDescription, - in nativeChar aMimeTypes, - in nativeChar aMimeDescriptions, - in nativeChar aFileExtensions, - in long aCount); - - /** - * Unregister a plugin from the plugin manager - * - * @param aCID the CID of the plugin to unregister. - * @result - NS_OK if the operation was successful. - */ - [noscript] void UnregisterPlugin(in REFNSIID aCID); - - /** - * Fetches a URL, with Headers - - * @see GetURL. Identical except for additional params headers and - * headersLen - - * @param getHeadersLength - the length of getHeaders (if non-NULL) - - * @param getHeaders - the headers to GET. Must be in the form of - * "HeaderName: HeaderValue\r\n". Each header, including the last, - * must be followed by "\r\n". NULL specifies that there are no - * get headers - - * @result - NS_OK if this operation was successful - - */ -%{C++ - NS_IMETHOD - GetURLWithHeaders(nsISupports* pluginInst, - const char* url, - const char* target = NULL, - nsIPluginStreamListener* streamListener = NULL, - const char* altHost = NULL, - const char* referrer = NULL, - PRBool forceJSEnabled = PR_FALSE, - PRUint32 getHeadersLength = 0, - const char* getHeaders = NULL) = 0; -%} - + void postURL(in nsISupports pluginInst, + in wstring url, + in unsigned long postDataLen, + in string postData, // XXX wstring? + in unsigned long postHeadersLength, + in string postHeaders, // XXX wstring? + in boolean isFile, + in wstring target, + in nsIPluginStreamListener streamListener, + in wstring altHost, + in wstring referrer, + in boolean forceJSEnabled); }; -