new shit

git-svn-id: svn://10.0.0.236/branches/IMGLIB2_NEW@91713 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/content/build/gbdate.pl

@@ -1,27 +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): 
-#
-
-# XP way of doing the build date.
-# 1998091509 = 1998, September, 15th, 9am local time zone
-($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
-# localtime returns year minus 1900
-$year = $year + 1900;
-printf("#define PRODUCT_VERSION \"%04d%02d%02d\"\n", $year, 1+$mon, $mday);

mozilla/content/build/nsContentHTTPStartup.cpp

@@ -1,90 +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 Communicator client 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):
- *   Alec Flett <alecf@netscape.com>
- */
-
-#include "nsIServiceManager.h"
-#include "nsICategoryManager.h"
-
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsXPIDLString.h"
-
-#include "nsContentHTTPStartup.h"
-#include "nsIHttpProtocolHandler.h"
-#include "gbdate.h"
-
-#define PRODUCT_NAME "Gecko"
-
-NS_IMPL_ISUPPORTS1(nsContentHTTPStartup,nsIObserver)
-
-nsresult
-nsContentHTTPStartup::Observe( nsISupports *aSubject,
-                              const PRUnichar *aTopic,
-                              const PRUnichar *aData)
-{
-    if (nsCRT::strcmp(aTopic, NS_HTTP_STARTUP_TOPIC) != 0)
-        return NS_OK;
-    
-    nsresult rv = nsnull;
-
-    nsCOMPtr<nsIHttpProtocolHandler> http(do_QueryInterface(aSubject));
-    if (NS_FAILED(rv)) return rv;
-    
-    rv = http->SetProduct(PRODUCT_NAME);
-    if (NS_FAILED(rv)) return rv;
-    
-    rv = http->SetProductSub((char*) PRODUCT_VERSION);
-    if (NS_FAILED(rv)) return rv;
-    
-    return NS_OK;
-}
-
-nsresult
-nsContentHTTPStartup::RegisterHTTPStartup()
-{
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager>
-        catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  
-    if (NS_FAILED(rv)) return rv;
-
-    nsXPIDLCString previousEntry;
-    rv = catMan->AddCategoryEntry(NS_HTTP_STARTUP_CATEGORY,
-                                  "Content UserAgent Setter",
-                                  NS_CONTENTHTTPSTARTUP_CONTRACTID,
-                                  PR_TRUE, PR_TRUE,
-                                  getter_Copies(previousEntry));
-    return rv;
-}
-
-nsresult
-nsContentHTTPStartup::UnregisterHTTPStartup()
-{
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager>
-        catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  
-    if (NS_FAILED(rv)) return rv;
-
-
-    return NS_OK;
-}

mozilla/content/xml/document/src/nsXMLDocument.h

@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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 Communicator client 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): 
- */
-
-#ifndef nsXMLDocument_h___
-#define nsXMLDocument_h___
-
-#include "nsMarkupDocument.h"
-#include "nsIXMLDocument.h"
-#include "nsIHTMLContentContainer.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIHttpEventSink.h"
-
-class nsIParser;
-class nsIDOMNode;
-class nsICSSLoader;
-class nsIURI;
-
-class nsXMLDocument : public nsMarkupDocument,
-                      public nsIXMLDocument,
-                      public nsIHTMLContentContainer,
-                      public nsIInterfaceRequestor,
-                      public nsIHttpEventSink
-{
-public:
-  nsXMLDocument();
-  virtual ~nsXMLDocument();
-
-  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
-
-  NS_IMETHOD_(nsrefcnt) AddRef(void);
-  NS_IMETHOD_(nsrefcnt) Release(void);
-
-  NS_IMETHOD Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup);
-
-  NS_IMETHOD GetContentType(nsAWritableString& aContentType) const;
-
-  NS_IMETHOD StartDocumentLoad(const char* aCommand,
-                               nsIChannel* channel,
-                               nsILoadGroup* aLoadGroup,
-                               nsISupports* aContainer,
-                               nsIStreamListener **aDocListener,
-                               PRBool aReset = PR_TRUE);
-
-  NS_IMETHOD EndLoad();
-
-  NS_IMETHOD GetBaseTarget(nsAWritableString &aBaseTarget);
-  NS_IMETHOD SetBaseTarget(const nsAReadableString &aBaseTarget);
-
-  // nsIDOMNode interface
-  NS_IMETHOD CloneNode(PRBool aDeep, nsIDOMNode** aReturn);
-
-  // nsIDOMDocument interface
-  NS_IMETHOD    GetDoctype(nsIDOMDocumentType** aDocumentType);
-  NS_IMETHOD    CreateCDATASection(const nsAReadableString& aData, nsIDOMCDATASection** aReturn);
-  NS_IMETHOD    CreateEntityReference(const nsAReadableString& aName, nsIDOMEntityReference** aReturn);
-  NS_IMETHOD    CreateProcessingInstruction(const nsAReadableString& aTarget, const nsAReadableString& aData, nsIDOMProcessingInstruction** aReturn);
-  NS_IMETHOD    CreateElement(const nsAReadableString& aTagName, 
-                              nsIDOMElement** aReturn);
-  NS_IMETHOD    ImportNode(nsIDOMNode* aImportedNode,
-                           PRBool aDeep,
-                           nsIDOMNode** aReturn);
-  NS_IMETHOD    CreateElementNS(const nsAReadableString& aNamespaceURI,
-                               const nsAReadableString& aQualifiedName,
-                               nsIDOMElement** aReturn);
-  NS_IMETHOD    CreateAttributeNS(const nsAReadableString& aNamespaceURI,
-                                  const nsAReadableString& aQualifiedName,
-                                  nsIDOMAttr** aReturn);
-  NS_IMETHOD    GetElementById(const nsAReadableString& aElementId,
-                               nsIDOMElement** aReturn);
-  NS_IMETHOD    Load(const nsAReadableString& aUrl);
-
-  // nsIXMLDocument interface
-  NS_IMETHOD SetDefaultStylesheets(nsIURI* aUrl);
-  NS_IMETHOD SetTitle(const PRUnichar *aTitle);
-
-  // nsIHTMLContentContainer
-  NS_IMETHOD GetAttributeStyleSheet(nsIHTMLStyleSheet** aResult);
-  NS_IMETHOD GetInlineStyleSheet(nsIHTMLCSSStyleSheet** aResult);
-  NS_IMETHOD GetCSSLoader(nsICSSLoader*& aLoader);
-
-  // nsIInterfaceRequestor
-  NS_IMETHOD GetInterface(const nsIID& aIID, void** aSink);
-
-  // nsIHTTPEventSink
-  NS_DECL_NSIHTTPEVENTSINK
-
-protected:
-  virtual void InternalAddStyleSheet(nsIStyleSheet* aSheet);  // subclass hook for sheet ordering
-  virtual void InternalInsertStyleSheetAt(nsIStyleSheet* aSheet, PRInt32 aIndex);
-
-  // For HTML elements in our content model
-  // XXX This is not clean, but is there a better way? 
-  nsIHTMLStyleSheet*    mAttrStyleSheet;
-  nsIHTMLCSSStyleSheet* mInlineStyleSheet;
-  nsString mBaseTarget;
-
-  nsIParser *mParser;
-  nsICSSLoader* mCSSLoader;
-};
-
-
-#endif // nsXMLDocument_h___

mozilla/extensions/cookie/nsCookieHTTPNotify.cpp

@@ -1,250 +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): 
- */
-
-#ifdef DEBUG_dp
-#include <stdio.h>
-#endif 
-
-#include "nsCookieService.h" /* don't remove -- needed for mac build */
-#include "nsCookieHTTPNotify.h"
-#include "nsIGenericFactory.h"
-#include "nsIHttpChannel.h"
-#include "nsCookie.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsXPIDLString.h"
-#include "nsIServiceManager.h"
-#include "nsINetModuleMgr.h" 
-#include "nsILoadGroup.h"
-#include "nsICategoryManager.h"
-#include "nsIHttpProtocolHandler.h"		// for NS_HTTP_STARTUP_CATEGORY
-#include "nsIInterfaceRequestor.h"
-#include "nsIPrompt.h"
-
-static NS_DEFINE_CID(kINetModuleMgrCID, NS_NETMODULEMGR_CID);
-
-///////////////////////////////////
-// nsISupports
-
-NS_IMPL_ISUPPORTS2(nsCookieHTTPNotify, nsIHttpNotify, nsINetNotify);
-
-///////////////////////////////////
-// nsCookieHTTPNotify Implementation
-
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCookieHTTPNotify, Init)
-
-nsresult nsCookieHTTPNotify::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    return nsCookieHTTPNotifyConstructor(aOuter, aIID, aResult);
-}
-
-NS_METHOD nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
-                                           nsIFile *aPath,
-                                           const char *registryLocation,
-                                           const char *componentType,
-                                           const nsModuleComponentInfo *info)
-{
-    // Register ourselves into the NS_CATEGORY_HTTP_STARTUP
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager> catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsXPIDLCString prevEntry;
-    rv = catman->AddCategoryEntry(NS_HTTP_STARTUP_CATEGORY, "Http Cookie Notify", NS_COOKIEHTTPNOTIFY_CONTRACTID,
-                                  PR_TRUE, PR_TRUE, getter_Copies(prevEntry));
-
-    return NS_OK;
-
-}
-
-NS_METHOD nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
-                                             nsIFile *aPath,
-                                             const char *registryLocation,
-                                             const nsModuleComponentInfo *info)
-{
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager> catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsXPIDLCString prevEntry;
-    rv = catman->DeleteCategoryEntry(NS_HTTP_STARTUP_CATEGORY, NS_COOKIEHTTPNOTIFY_CONTRACTID, PR_TRUE,
-                                     getter_Copies(prevEntry));
-
-    // Return value is not used from this function.
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCookieHTTPNotify::Init()
-{
-    // Register to handing http requests and responses
-    nsresult rv = NS_OK;
-    nsCOMPtr<nsINetModuleMgr> pNetModuleMgr = do_GetService(kINetModuleMgrCID, &rv); 
-    if (NS_FAILED(rv)) return rv;
-    rv = pNetModuleMgr->RegisterModule(NS_NETWORK_MODULE_MANAGER_HTTP_REQUEST_CONTRACTID,
-                                       (nsIHttpNotify *)this);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = pNetModuleMgr->RegisterModule(NS_NETWORK_MODULE_MANAGER_HTTP_RESPONSE_CONTRACTID,
-                                       (nsIHttpNotify *)this);
-    return rv;
-}
-
-nsCookieHTTPNotify::nsCookieHTTPNotify()
-{
-    NS_INIT_REFCNT();
-    mCookieService = nsnull;
-#ifdef DEBUG_dp
-    printf("CookieHTTPNotify Created.\n");
-#endif /* DEBUG_dp */
-}
-
-nsCookieHTTPNotify::~nsCookieHTTPNotify()
-{
-}
-
-NS_IMETHODIMP
-nsCookieHTTPNotify::SetupCookieService()
-{
-    nsresult rv = NS_OK;
-    if (!mCookieService)
-    {
-      mCookieService = do_GetService(NS_COOKIESERVICE_CONTRACTID, &rv);
-    }
-    return rv;
-}
-
-///////////////////////////////////
-// nsIHttpNotify
-
-NS_IMETHODIMP
-nsCookieHTTPNotify::OnModifyRequest(nsIHttpChannel *aHttpChannel)
-{
-    nsresult rv;
-    // Preconditions
-    NS_ENSURE_ARG_POINTER(aHttpChannel);
-
-    // Get the url
-    nsCOMPtr<nsIURI> pURL;
-    rv = aHttpChannel->GetURI(getter_AddRefs(pURL));
-    if (NS_FAILED(rv)) return rv;
-
-    // Get the original url that the user either typed in or clicked on
-    nsCOMPtr<nsILoadGroup> pLoadGroup;
-    rv = aHttpChannel->GetLoadGroup(getter_AddRefs(pLoadGroup));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> pChannel;
-    if (pLoadGroup) {
-      nsCOMPtr<nsIRequest> pRequest;
-      rv = pLoadGroup->GetDefaultLoadRequest(getter_AddRefs(pRequest));
-      if (pRequest)
-        pChannel = do_QueryInterface(pRequest);
-    }
-
-    nsCOMPtr<nsIURI> pFirstURL;
-    if (pChannel) {
-      rv = pChannel->GetURI(getter_AddRefs(pFirstURL));
-    } else {
-      rv = aHttpChannel->GetURI(getter_AddRefs(pFirstURL));
-    }
-    if (NS_FAILED(rv)) return rv;
-
-    // Ensure that the cookie service exists
-    rv = SetupCookieService();
-    if (NS_FAILED(rv)) return rv;
-
-    char * cookie;
-    rv = mCookieService->GetCookieStringFromHttp(pURL, pFirstURL, &cookie);
-    if (NS_FAILED(rv)) return rv;
-
-    // Set the cookie into the request headers
-    if (cookie && *cookie)
-        rv = aHttpChannel->SetRequestHeader("Cookie", cookie);
-    nsMemory::Free((void *)cookie);
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsCookieHTTPNotify::OnExamineResponse(nsIHttpChannel *aHttpChannel)
-{
-    nsresult rv;
-    // Preconditions
-    NS_ENSURE_ARG_POINTER(aHttpChannel);
-
-    // Get the Cookie header
-    nsXPIDLCString cookieHeader;
-    rv = aHttpChannel->GetResponseHeader("Set-Cookie", getter_Copies(cookieHeader));
-    if (NS_FAILED(rv)) return rv;
-    if (!cookieHeader) return NS_OK; // not an error, there's just no header.
-
-    // Get the url
-    nsCOMPtr<nsIURI> pURL;
-    rv = aHttpChannel->GetURI(getter_AddRefs(pURL));
-    if (NS_FAILED(rv)) return rv;
-
-    // Get the original url that the user either typed in or clicked on
-    nsCOMPtr<nsILoadGroup> pLoadGroup;
-    rv = aHttpChannel->GetLoadGroup(getter_AddRefs(pLoadGroup));
-    if (NS_FAILED(rv)) return rv;
-    nsCOMPtr<nsIChannel> pChannel;
-    if (pLoadGroup) {
-      nsCOMPtr<nsIRequest> pRequest;
-      rv = pLoadGroup->GetDefaultLoadRequest(getter_AddRefs(pRequest));
-      if (NS_FAILED(rv)) return rv;
-      pChannel = do_QueryInterface(pRequest);
-    }
-    nsCOMPtr<nsIURI> pFirstURL;
-    if (pChannel) {
-      rv = pChannel->GetURI(getter_AddRefs(pFirstURL));
-    } else {
-      rv = aHttpChannel->GetURI(getter_AddRefs(pFirstURL));
-    }
-    if (NS_FAILED(rv)) return rv;
-
-    // Get the prompter
-    nsCOMPtr<nsIInterfaceRequestor> pInterfaces;
-    nsCOMPtr<nsIPrompt> pPrompter;
-    if (pChannel) {
-      pChannel->GetNotificationCallbacks(getter_AddRefs(pInterfaces));
-    } else {
-      aHttpChannel->GetNotificationCallbacks(getter_AddRefs(pInterfaces));
-    }
-    if (pInterfaces)
-      pInterfaces->GetInterface(NS_GET_IID(nsIPrompt), getter_AddRefs(pPrompter));
-
-    // Get the expires
-    nsXPIDLCString dateHeader;
-    rv = aHttpChannel->GetResponseHeader("Date", getter_Copies(dateHeader));
-    if (NS_FAILED(rv)) return rv;
-
-    // Ensure that we have the cookie service
-    rv = SetupCookieService();
-    if (NS_FAILED(rv)) return rv;
-
-    // Save the cookie
-    rv = mCookieService->SetCookieStringFromHttp(pURL, pFirstURL, pPrompter, cookieHeader, dateHeader);
-
-    return rv;
-}
-

mozilla/extensions/cookie/nsCookieHTTPNotify.h

@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; 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): 
- */
-
-#ifndef nsCookieHTTPNotify_h___
-#define nsCookieHTTPNotify_h___
-
-#include "nsIHttpNotify.h"
-#include "nsICookieService.h"
-#include "nsIComponentManager.h"
-
-// {6BC1F522-1F45-11d3-8AD4-00105A1B8860}
-#define NS_COOKIEHTTPNOTIFY_CID \
-{ 0x6bc1f522, 0x1f45, 0x11d3, { 0x8a, 0xd4, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
-
-#define NS_COOKIEHTTPNOTIFY_CONTRACTID "@mozilla.org/cookie-notifier;1"
-#define NS_COOKIEHTTPNOTIFY_CLASSNAME "Cookie Notifier"
-
-struct nsModuleComponentInfo;   // forward declaration
-
-class nsCookieHTTPNotify : public nsIHttpNotify {
-public:
-
-  // nsISupports
-  NS_DECL_ISUPPORTS
-
-  // Init method
-  NS_IMETHOD Init();
-
-  // nsIHttpNotify methods:
-  NS_DECL_NSIHTTPNOTIFY
-   
-  // nsCookieHTTPNotify methods:
-  nsCookieHTTPNotify();
-  virtual ~nsCookieHTTPNotify();
-
-  static nsresult Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-  static NS_METHOD RegisterProc(nsIComponentManager *aCompMgr,
-                                nsIFile *aPath,
-                                const char *registryLocation,
-                                const char *componentType,
-                                const nsModuleComponentInfo *info);
-  static NS_METHOD UnregisterProc(nsIComponentManager *aCompMgr,
-                                  nsIFile *aPath,
-                                  const char *registryLocation,
-                                  const nsModuleComponentInfo *info);
-
-private:
-    nsCOMPtr<nsICookieService> mCookieService;
-
-    NS_IMETHOD SetupCookieService();
-};
-#endif /* nsCookieHTTPNotify_h___ */

mozilla/extensions/datetime/Makefile.in

@@ -1,43 +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): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= nkdatetm_s
-REQUIRES	= xpcom string
-
-CPPSRCS		= \
-		nsDateTimeHandler.cpp \
-		nsDateTimeChannel.cpp \
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/datetime/nsDateTimeChannel.cpp

@@ -1,327 +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): 
- */
-
-// datetime implementation
-
-#include "nsDateTimeChannel.h"
-#include "nsIServiceManager.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsISocketTransportService.h"
-#include "nsITransport.h"
-#include "nsIProgressEventSink.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-
-// nsDateTimeChannel methods
-nsDateTimeChannel::nsDateTimeChannel() {
-    NS_INIT_REFCNT();
-    mContentLength = -1;
-    mPort = -1;
-}
-
-nsDateTimeChannel::~nsDateTimeChannel() {
-}
-
-NS_IMPL_ISUPPORTS4(nsDateTimeChannel, 
-                   nsIChannel, 
-                   nsIRequest, 
-                   nsIStreamListener, 
-                   nsIRequestObserver)
-
-nsresult
-nsDateTimeChannel::Init(nsIURI* uri)
-{
-    nsresult rv;
-
-    NS_ASSERTION(uri, "no uri");
-
-    mUrl = uri;
-
-    rv = mUrl->GetPort(&mPort);
-    if (NS_FAILED(rv) || mPort < 1)
-        mPort = DATETIME_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(mHost));
-    if (NS_FAILED(rv)) return rv;
-
-    if (!*(const char *)mHost) return NS_ERROR_NOT_INITIALIZED;
-
-    return NS_OK;
-}
-
-NS_METHOD
-nsDateTimeChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
-{
-    nsDateTimeChannel* dc = new nsDateTimeChannel();
-    if (dc == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(dc);
-    nsresult rv = dc->QueryInterface(aIID, aResult);
-    NS_RELEASE(dc);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetName(PRUnichar* *result)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::IsPending(PRBool *result)
-{
-    NS_NOTREACHED("nsDateTimeChannel::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetStatus(nsresult *status)
-{
-    *status = NS_OK;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Cancel(nsresult status)
-{
-    NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
-    NS_NOTREACHED("nsDateTimeChannel::Cancel");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Suspend(void)
-{
-    NS_NOTREACHED("nsDateTimeChannel::Suspend");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Resume(void)
-{
-    NS_NOTREACHED("nsDateTimeChannel::Resume");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetOriginalURI(nsIURI* *aURI)
-{
-    *aURI = mOriginalURI ? mOriginalURI : mUrl;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetOriginalURI(nsIURI* aURI)
-{
-    mOriginalURI = aURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetURI(nsIURI* *aURI)
-{
-    *aURI = mUrl;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Open(nsIInputStream **_retval)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsITransport> transport;
-    rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, 32, 32, getter_AddRefs(transport));
-    if (NS_FAILED(rv)) return rv;
-
-    transport->SetNotificationCallbacks(mCallbacks,
-                                        (mLoadFlags & LOAD_BACKGROUND));
-
-    return transport->OpenInputStream(0, -1, 0, _retval);
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsITransport> transport;
-    rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, 32, 32, getter_AddRefs(transport));
-    if (NS_FAILED(rv)) return rv;
-
-    transport->SetNotificationCallbacks(mCallbacks,
-                                        (mLoadFlags & LOAD_BACKGROUND));
-
-    mListener = aListener;
-    
-    nsCOMPtr<nsIRequest> request;
-    return transport->AsyncRead(this, ctxt, 0, -1, 0, getter_AddRefs(request));
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetLoadFlags(PRUint32 *aLoadFlags)
-{
-    *aLoadFlags = mLoadFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetLoadFlags(PRUint32 aLoadFlags)
-{
-    mLoadFlags = aLoadFlags;
-    return NS_OK;
-}
-
-#define DATETIME_TYPE "text/plain"
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetContentType(char* *aContentType) {
-    if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-    *aContentType = nsCRT::strdup(DATETIME_TYPE);
-    if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetContentType(const char *aContentType)
-{
-    //It doesn't make sense to set the content-type on this type
-    // of channel...
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetContentLength(PRInt32 aContentLength)
-{
-    NS_NOTREACHED("nsDateTimeChannel::SetContentLength");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    if (mLoadGroup) // if we already had a load group remove ourselves...
-      (void)mLoadGroup->RemoveRequest(this, nsnull, NS_OK);
-
-    mLoadGroup = aLoadGroup;
-    if (mLoadGroup) {
-        return mLoadGroup->AddRequest(this, nsnull);
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetSecurityInfo(nsISupports **sec)
-{
-    NS_ENSURE_ARG_POINTER(sec);
-    *sec = nsnull;
-    return NS_OK;
-}
-
-// nsIRequestObserver methods
-NS_IMETHODIMP
-nsDateTimeChannel::OnStartRequest(nsIRequest *request, nsISupports *aContext) {
-    return mListener->OnStartRequest(this, aContext);
-}
-
-
-NS_IMETHODIMP
-nsDateTimeChannel::OnStopRequest(nsIRequest *request, nsISupports* aContext,
-                                 nsresult aStatus) {
-    if (mLoadGroup) {
-        nsresult rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus);
-        if (NS_FAILED(rv)) return rv;
-    }
-    return mListener->OnStopRequest(this, aContext, aStatus);
-}
-
-
-// nsIStreamListener method
-NS_IMETHODIMP
-nsDateTimeChannel::OnDataAvailable(nsIRequest *request, nsISupports* aContext,
-                               nsIInputStream *aInputStream, PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-    mContentLength = aLength;
-    return mListener->OnDataAvailable(this, aContext, aInputStream, aSourceOffset, aLength);
-}
-

mozilla/extensions/datetime/nsDateTimeChannel.h

@@ -1,78 +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): 
- */
-
-// A datetime channel retrieves date time information from 
-// RFC 867 compliant datetime servers. The date/time returned
-// to the caller is of MIME type "text/plain".
-
-#ifndef nsDateTimeChannel_h___
-#define nsDateTimeChannel_h___
-
-#include "nsString.h"
-#include "nsILoadGroup.h"
-#include "nsIInputStream.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "nsDateTimeHandler.h"
-#include "nsIStreamListener.h"
-
-
-class nsDateTimeChannel 
-: public nsIChannel, 
-  public nsIStreamListener {
-
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSIREQUESTOBSERVER
-
-    // nsDateTimeChannel methods:
-    nsDateTimeChannel();
-    virtual ~nsDateTimeChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-    
-    nsresult Init(nsIURI* uri);
-
-protected:
-    nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-    nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsCOMPtr<nsIURI>                    mUrl;
-    nsCOMPtr<nsIStreamListener>         mListener;
-    PRUint32                            mLoadFlags;
-    nsCOMPtr<nsILoadGroup>              mLoadGroup;
-    nsCString                           mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsISupports>               mOwner; 
-
-    PRInt32                             mPort;
-    nsXPIDLCString                      mHost;
-};
-
-#endif /* nsDateTimeChannel_h___ */

mozilla/extensions/datetime/nsDateTimeHandler.cpp

@@ -1,117 +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): 
- */
-
-#include "nspr.h"
-#include "nsDateTimeChannel.h"
-#include "nsDateTimeHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
-#include "nsNetCID.h"
-
-static NS_DEFINE_CID(kSimpleURICID,            NS_SIMPLEURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsDateTimeHandler::nsDateTimeHandler() {
-    NS_INIT_REFCNT();
-}
-
-nsDateTimeHandler::~nsDateTimeHandler() {
-}
-
-NS_IMPL_ISUPPORTS1(nsDateTimeHandler, nsIProtocolHandler)
-
-NS_METHOD
-nsDateTimeHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
-
-    nsDateTimeHandler* ph = new nsDateTimeHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->QueryInterface(aIID, aResult);
-    NS_RELEASE(ph);
-    return rv;
-}
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsDateTimeHandler::GetScheme(char* *result) {
-    *result = nsCRT::strdup("datetime");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::GetDefaultPort(PRInt32 *result) {
-    *result = DATETIME_PORT;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result) {
-    nsresult rv;
-
-    // no concept of a relative datetime url
-    NS_ASSERTION(!aBaseURI, "base url passed into datetime protocol handler");
-
-    nsIURI* url;
-    rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
-                                            NS_GET_IID(nsIURI),
-                                            (void**)&url);
-    if (NS_FAILED(rv)) return rv;
-    rv = url->SetSpec((char*)aSpec);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::NewChannel(nsIURI* url, nsIChannel* *result)
-{
-    nsresult rv;
-    
-    nsDateTimeChannel* channel;
-    rv = nsDateTimeChannel::Create(nsnull, NS_GET_IID(nsIChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->Init(url);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/extensions/datetime/nsDateTimeHandler.h

@@ -1,51 +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): 
- */
-
-// The datetime protocol handler creates "datetime" URIs of the form
-// "datetime:RFC867Server".
-
-#ifndef nsDateTimeHandler_h___
-#define nsDateTimeHandler_h___
-
-#include "nsIProtocolHandler.h"
-
-#define DATETIME_PORT 13
-
-// {AA27D2A0-B71B-11d3-A1A0-0050041CAF44}
-#define NS_DATETIMEHANDLER_CID \
-{ 0xaa27d2a0, 0xb71b, 0x11d3, { 0xa1, 0xa0, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-
-class nsDateTimeHandler : public nsIProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsDateTimeHandler methods:
-    nsDateTimeHandler();
-    virtual ~nsDateTimeHandler();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-};
-
-#endif /* nsDateTimeHandler_h___ */

mozilla/extensions/datetime/nsDateTimeModule.cpp

@@ -1,34 +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): 
- */
-
-#include "nsIGenericFactory.h"
-#include "nsDateTimeHandler.h"
-
-static nsModuleComponentInfo gResComponents[] = {
-    { "The DateTime Protocol Handler", 
-      NS_DATETIMEHANDLER_CID,
-      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "datetime",
-      nsDateTimeHandler::Create
-    }
-};
-
-NS_IMPL_NSGETMODULE(datetime, gResComponents)

mozilla/extensions/finger/nsFingerChannel.cpp

@@ -1,427 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Brian Ryner <bryner@uiuc.edu>
- */
-
-// finger implementation
-
-#include "nsFingerChannel.h"
-#include "nsIServiceManager.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsISocketTransportService.h"
-#include "nsIStringStream.h"
-#include "nsMimeTypes.h"
-#include "nsIStreamConverterService.h"
-#include "nsITXTToHTMLConv.h"
-#include "nsIProgressEventSink.h"
-#include "nsNetUtil.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
-
-#define BUFFER_SEG_SIZE (4*1024)
-#define BUFFER_MAX_SIZE (64*1024)
-
-// nsFingerChannel methods
-nsFingerChannel::nsFingerChannel()
-    : mContentLength(-1),
-      mActAsObserver(PR_TRUE),
-      mPort(-1),
-      mStatus(NS_OK)
-{
-    NS_INIT_REFCNT();
-}
-
-nsFingerChannel::~nsFingerChannel() {
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS4(nsFingerChannel, 
-                              nsIChannel, 
-                              nsIRequest,
-                              nsIStreamListener, 
-                              nsIRequestObserver)
-
-nsresult
-nsFingerChannel::Init(nsIURI* uri)
-{
-    nsresult rv;
-    nsXPIDLCString autoBuffer;
-
-    NS_ASSERTION(uri, "no uri");
-
-    mUrl = uri;
-
-//  For security reasons, we do not allow the user to specify a
-//  non-default port for finger: URL's.
-
-    mPort = FINGER_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(autoBuffer)); // autoBuffer = user@host
-    if (NS_FAILED(rv)) return rv;
-
-    // Now parse out the user and host
-    const char* buf = autoBuffer.get();
-    const char* pos = PL_strchr(buf, '@');
-
-    // Catch the case of just the host being given
-    if (!pos) {
-        mHost.Assign(buf);
-    } else {
-        mUser.Assign(buf,pos-buf);
-        mHost.Assign(pos+1); // ignore '@'
-    }
-
-    if (mHost.IsEmpty()) return NS_ERROR_NOT_INITIALIZED;
-
-    return NS_OK;
-}
-
-NS_METHOD
-nsFingerChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
-{
-    nsFingerChannel* fc = new nsFingerChannel();
-    if (fc == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(fc);
-    nsresult rv = fc->QueryInterface(aIID, aResult);
-    NS_RELEASE(fc);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP
-nsFingerChannel::GetName(PRUnichar* *result)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::IsPending(PRBool *result)
-{
-    NS_NOTREACHED("nsFingerChannel::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetStatus(nsresult *status)
-{
-    *status = mStatus;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Cancel(nsresult status)
-{
-    NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
-    nsresult rv = NS_ERROR_FAILURE;
-
-    mStatus = status;
-    if (mTransportRequest) {
-      rv = mTransportRequest->Cancel(status);
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Suspend(void)
-{
-    NS_NOTREACHED("nsFingerChannel::Suspend");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Resume(void)
-{
-    NS_NOTREACHED("nsFingerChannel::Resume");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP
-nsFingerChannel::GetOriginalURI(nsIURI* *aURI)
-{
-    *aURI = mOriginalURI ? mOriginalURI : mUrl;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetOriginalURI(nsIURI* aURI)
-{
-    mOriginalURI = aURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetURI(nsIURI* *aURI)
-{
-    *aURI = mUrl;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Open(nsIInputStream **_retval)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE,
-            BUFFER_MAX_SIZE, getter_AddRefs(mTransport));
-    if (NS_FAILED(rv)) return rv;
-
-    mTransport->SetNotificationCallbacks(mCallbacks,
-                                         (mLoadFlags & LOAD_BACKGROUND));
-
-    return mTransport->OpenInputStream(0, PRUint32(-1), 0, _retval);
-}
-
-NS_IMETHODIMP
-nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE,
-      BUFFER_MAX_SIZE, getter_AddRefs(mTransport));
-    if (NS_FAILED(rv)) return rv;
-
-    mTransport->SetNotificationCallbacks(mCallbacks,
-                                         (mLoadFlags & LOAD_BACKGROUND));
-
-    mListener = aListener;
-    mResponseContext = ctxt;
-
-    return SendRequest(mTransport);
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetLoadFlags(PRUint32 *aLoadFlags)
-{
-    *aLoadFlags = mLoadFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetLoadFlags(PRUint32 aLoadFlags)
-{
-    mLoadFlags = aLoadFlags;
-    return NS_OK;
-}
-
-#define FINGER_TYPE TEXT_HTML
-
-NS_IMETHODIMP
-nsFingerChannel::GetContentType(char* *aContentType) {
-    if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-    *aContentType = nsCRT::strdup(FINGER_TYPE);
-    if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetContentType(const char *aContentType)
-{
-    //It doesn't make sense to set the content-type on this type
-    // of channel...
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetContentLength(PRInt32 aContentLength)
-{
-    NS_NOTREACHED("nsFingerChannel::SetContentLength");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    mLoadGroup = aLoadGroup;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsFingerChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-    *aSecurityInfo = nsnull;
-    return NS_OK;
-}
-
-// nsIRequestObserver methods
-NS_IMETHODIMP
-nsFingerChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) {
-    if (!mActAsObserver) {
-      // acting as a listener
-      return mListener->OnStartRequest(this, mResponseContext);
-    } else {
-      // we don't want to pass our AsyncWrite's OnStart through
-      // we just ignore this
-      return NS_OK;
-    }
-}
-
-
-NS_IMETHODIMP
-nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext,
-                               nsresult aStatus)
-{
-    nsresult rv = NS_OK;
-
-    if (NS_FAILED(aStatus) || !mActAsObserver) {
-        if (mLoadGroup) {
-          rv = mLoadGroup->RemoveRequest(this, nsnull, aStatus);
-          if (NS_FAILED(rv)) return rv;
-        }
-        rv = mListener->OnStopRequest(this, mResponseContext, aStatus);
-        mTransport = 0;
-        return rv;
-    } else {
-        // at this point we know the request has been sent.
-        // we're no longer acting as an observer.
- 
-        mActAsObserver = PR_FALSE;
-        nsCOMPtr<nsIStreamListener> converterListener;
-
-        NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService,
-                         kStreamConverterServiceCID, &rv);
-        if (NS_FAILED(rv)) return rv;
-
-        nsAutoString fromStr; fromStr.AssignWithConversion("text/plain");
-        nsAutoString toStr; toStr.AssignWithConversion("text/html");
-
-        rv = StreamConvService->AsyncConvertData(fromStr.GetUnicode(),
-              toStr.GetUnicode(), this, mResponseContext,
-              getter_AddRefs(converterListener));
-        if (NS_FAILED(rv)) return rv;
-
-        nsCOMPtr<nsITXTToHTMLConv> converter(do_QueryInterface(converterListener));
-        if (converter) {
-          nsAutoString title; title.AssignWithConversion("Finger information for ");
-          nsXPIDLCString userHost;
-          rv = mUrl->GetPath(getter_Copies(userHost));
-          title.AppendWithConversion(userHost);
-          converter->SetTitle(title.GetUnicode());
-          converter->PreFormatHTML(PR_TRUE);
-        }
-
-        return mTransport->AsyncRead(converterListener, mResponseContext, 0, PRUint32(-1), 0,
-                                     getter_AddRefs(mTransportRequest));
-    }
-
-}
-
-
-// nsIStreamListener method
-NS_IMETHODIMP
-nsFingerChannel::OnDataAvailable(nsIRequest *aRequest, nsISupports* aContext,
-                               nsIInputStream *aInputStream, PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-    mContentLength = aLength;
-    return mListener->OnDataAvailable(this, mResponseContext, aInputStream, aSourceOffset, aLength);
-}
-
-nsresult
-nsFingerChannel::SendRequest(nsITransport* aTransport) {
-  // The text to send should already be in mUser
-
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsISupports> result;
-  nsCOMPtr<nsIInputStream> charstream;
-  nsCString requestBuffer(mUser);
-
-  if (mLoadGroup) {
-    mLoadGroup->AddRequest(this, nsnull);
-  }
-
-  requestBuffer.Append(CRLF);
-
-  mRequest = requestBuffer.ToNewCString();
-
-  rv = NS_NewCharInputStream(getter_AddRefs(result), mRequest);
-  if (NS_FAILED(rv)) return rv;
-
-  charstream = do_QueryInterface(result, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = NS_AsyncWriteFromStream(getter_AddRefs(mTransportRequest),
-                               aTransport, charstream,
-                               0, requestBuffer.Length(), 0,
-                               this, nsnull);
-  return rv;
-}
-
-

mozilla/extensions/finger/nsFingerChannel.h

@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Brian Ryner <bryner@uiuc.edu>
- */
-
-#ifndef nsFingerChannel_h___
-#define nsFingerChannel_h___
-
-#include "nsString.h"
-#include "nsILoadGroup.h"
-#include "nsIInputStream.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "nsFingerHandler.h"
-#include "nsIStreamListener.h"
-#include "nsITransport.h"
-
-class nsFingerChannel 
-: public nsIChannel, 
-  public nsIStreamListener {
-
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSIREQUESTOBSERVER
-
-    // nsFingerChannel methods:
-    nsFingerChannel();
-    virtual ~nsFingerChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-    
-    nsresult Init(nsIURI* uri);
-
-protected:
-    nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-    nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsCOMPtr<nsIURI>                    mUrl;
-    nsCOMPtr<nsIStreamListener>         mListener;
-    PRUint32                            mLoadFlags;
-    nsCOMPtr<nsILoadGroup>              mLoadGroup;
-    nsCString                           mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsISupports>               mOwner; 
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-    PRBool                              mActAsObserver;
-
-    PRInt32                             mPort;
-    nsCString                           mHost;
-    nsCString                           mUser;
-
-    nsXPIDLCString                      mRequest;
-
-    nsCOMPtr<nsISupports>               mResponseContext;
-    nsCOMPtr<nsITransport>              mTransport;
-    nsCOMPtr<nsIRequest>                mTransportRequest;
-    nsresult                            mStatus;
-
-protected:
-    nsresult SendRequest(nsITransport* aTransport);
-};
-
-#endif /* nsFingerChannel_h___ */

mozilla/extensions/finger/nsFingerHandler.cpp

@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Brian Ryner <bryner@uiuc.edu>
- */
-
-#include "nspr.h"
-#include "nsFingerChannel.h"
-#include "nsFingerHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
-#include "nsNetCID.h"
-
-static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsFingerHandler::nsFingerHandler() {
-    NS_INIT_REFCNT();
-}
-
-nsFingerHandler::~nsFingerHandler() {
-}
-
-NS_IMPL_ISUPPORTS1(nsFingerHandler, nsIProtocolHandler)
-
-NS_METHOD
-nsFingerHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
-
-    nsFingerHandler* ph = new nsFingerHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->QueryInterface(aIID, aResult);
-    NS_RELEASE(ph);
-    return rv;
-}
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsFingerHandler::GetScheme(char* *result) {
-    *result = nsCRT::strdup("finger");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::GetDefaultPort(PRInt32 *result) {
-    *result = FINGER_PORT;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result) {
-    nsresult rv;
-
-    // no concept of a relative finger url
-    NS_ASSERTION(!aBaseURI, "base url passed into finger protocol handler");
-
-    nsIURI* url;
-    rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
-                                            NS_GET_IID(nsIURI),
-                                            (void**)&url);
-    if (NS_FAILED(rv)) return rv;
-    rv = url->SetSpec((char*)aSpec);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::NewChannel(nsIURI* url, nsIChannel* *result)
-{
-    nsresult rv;
-    
-    nsFingerChannel* channel;
-    rv = nsFingerChannel::Create(nsnull, NS_GET_IID(nsIChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->Init(url);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/extensions/finger/nsFingerHandler.h

@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Brian Ryner <bryner@uiuc.edu>
- */
-
-// The finger protocol handler creates "finger" URIs of the form
-// "finger:user@host" or "finger:host".
-
-#ifndef nsFingerHandler_h___
-#define nsFingerHandler_h___
-
-#include "nsIProtocolHandler.h"
-
-#define FINGER_PORT 79
-
-// {0x76d6d5d8-1dd2-11b2-b361-850ddf15ef07}
-#define NS_FINGERHANDLER_CID     \
-{ 0x76d6d5d8, 0x1dd2, 0x11b2, \
-   {0xb3, 0x61, 0x85, 0x0d, 0xdf, 0x15, 0xef, 0x07} }
-
-class nsFingerHandler : public nsIProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsFingerHandler methods:
-    nsFingerHandler();
-    virtual ~nsFingerHandler();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-};
-
-#endif /* nsFingerHandler_h___ */

mozilla/extensions/finger/nsFingerModule.cpp

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Brian Ryner <bryner@uiuc.edu>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsFingerHandler.h"
-
-static nsModuleComponentInfo gResComponents[] = {
-    { "The Finger Protocol Handler", 
-      NS_FINGERHANDLER_CID,
-      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "finger",
-      nsFingerHandler::Create
-    }
-};
-
-NS_IMPL_NSGETMODULE(finger, gResComponents)

mozilla/extensions/xmlextras/base/public/nsIXMLHttpRequest.idl

@@ -1,180 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIDOMDocument;
-interface nsIDOMEventListener;
-interface nsIHttpChannel;
-
-[scriptable, uuid(b7215e70-4157-11d4-9a42-000064657374)]
-interface nsIXMLHttpRequest : nsISupports {
-  /**
-   * Meant to be a script-only mechanism for setting a load event listener.
-   * The attribute is expected to be JavaScript function object. When
-   * the load event occurs, the function is invoked. 
-   * This attribute should not be used from native code!!
-   */
-  attribute nsISupports onload;
-
-  /**
-   * Meant to be a script-only mechanism for setting an error event listener.
-   * The attribute is expected to be JavaScript function object. When
-   * the error event occurs, the function is invoked. 
-   * This attribute should not be used from native code!!
-   */
-  attribute nsISupports onerror;
-
-  /**
-   * The HTTP request uses an HTTP channel in order to perform the
-   * request.  This attribute represents the HTTP channel used
-   * for the request.  NULL if the HTTP channel has not yet been
-   * created.
-   */
-  readonly attribute nsIHttpChannel channel;
-
-  /**
-   * The response to the HTTP request is parsed as if it were a
-   * text/xml stream. This attributes represents the response as 
-   * a DOM Document object. NULL if the request is unsuccessful or
-   * has not yet been sent.
-   */
-  readonly attribute nsIDOMDocument responseXML;
-
-  /**
-   * The response to the HTTP request as text. 
-   * NULL if the request is unsuccessful or
-   * has not yet been sent.
-   */
-  readonly attribute wstring responseText;
-
-
-  /**
-   * The status of the response to the HTTP request.
-   */
-  readonly attribute unsigned long status;
-
-  /**
-   * The string representing the status of the response to the
-   * HTTP request.
-   */
-  readonly attribute string statusText;
-
-  /**
-   * If the HTTP request has been sent already, this method will
-   * abort the request.
-   */
-  void   abort();
-
-  /**
-   * Returns all of the HTTP response headers as a string string.
-   * 
-   * @returns A string containing all of the response headers. 
-   *          NULL if the response has not yet been received.
-   */
-  string getAllResponseHeaders();  
-
-  /**
-   * Returns the text of the header with the specified name.
-   *
-   * @param header The name of the header to retrieve
-   * @returns A string containing the text of the header specified.
-   *          NULL if the response has not yet been received or the
-   *          header does not exist in the response.
-   */
-  string getResponseHeader(in string header);
-
-  /**
-   * Native (non-script) method to initialize a request. Note that
-   * the HTTP request is not sent until the <code>send</code> method 
-   * is invoked.
-   *
-   * @param method The HTTP method - either "POST" or "GET".
-   * @param url The URL to which to send the request.
-   * @param async Whether the request is synchronous or asynchronous
-   *              i.e. whether send returns only after the response
-   *              is received or if it returns immediately after
-   *              sending the request. In the latter case, notification
-   *              of completion is sent through the event listeners.
-   * @param user A username for authentication if necessary.
-   * @param password A password for authentication if necessary.
-   */
-  [noscript] void   openRequest(in string method, 
-                                in string url, 
-                                in boolean async,
-                                in string user, 
-                                in string password);
-
-  /**
-   * Meant to be a script-only method for initializing a request.
-   * The parameters are similar to the ones detailed in the
-   * description of <code>openRequest</code>, but the last
-   * 3 are optional.
-   *
-   * @param method The HTTP method - either "POST" or "GET".
-   * @param url The URL to which to send the request.
-   * @param async (optional) Whether the request is synchronous or 
-   *              asynchronous i.e. whether send returns only after 
-   *              the response is received or if it returns immediately after
-   *              sending the request. In the latter case, notification
-   *              of completion is sent through the event listeners.
-   *              The default value is true.
-   * @param user (optional) A username for authentication if necessary. 
-   *             The default value is the empty string
-   * @param password (optional) A password for authentication if necessary.
-   *                 The default value is the empty string
-   */
-  void   open(in string method, in string url);
-
-  /**
-   * Sends the HTTP request. If the request is asynchronous, returns
-   * immediately after sending the request. If it is synchronous
-   * returns only after the response has been received.
-   *
-   * @param body Either an instance of nsIDOMDocument, nsIInputStream
-   *             or a string (nsISupportsWString in the native calling
-   *             case). This is used to populate the body of the
-   *             HTTP request if the HTTP request method is "POST".
-   *             If the parameter is a nsIDOMDocument, it is serialized.
-   *             If the parameter is a nsIInputStream, it is expected
-   *             to contain the ContentType: and ContentLength: headers
-   *             and trailing carriage-return/line-feed pairs.
-   */
-  void   send(in nsISupports body);
-
-  /**
-   * Sets a HTTP request header.
-   *
-   * @param header The name of the header to set in the request.
-   * @param value The body of the header.
-   */
-  void   setRequestHeader(in string header, in string value);  
-};
-
-%{ C++
-#define NS_XMLHTTPREQUEST_CID                       \
- { /* d164e770-4157-11d4-9a42-000064657374 */       \
-  0xd164e770, 0x4157, 0x11d4,                       \
- {0x9a, 0x42, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74} }
-#define NS_XMLHTTPREQUEST_CONTRACTID \
-"@mozilla.org/xmlextras/xmlhttprequest;1"
-%}

mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.h

@@ -1,244 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- */
-
-#ifndef nsXMLHttpRequest_h__
-#define nsXMLHttpRequest_h__
-
-#define IMPLEMENT_SYNC_LOAD
-
-#include "nsIXMLHttpRequest.h"
-#include "nsISupportsUtils.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsIDOMLoadListener.h"
-#include "nsIDOMEventTarget.h"
-#include "nsIDOMDocument.h"
-#include "nsISecurityCheckedComponent.h"
-#include "nsIURI.h"
-#include "nsIHttpChannel.h"
-#include "nsIDocument.h"
-#include "nsIStreamListener.h"
-#ifdef IMPLEMENT_SYNC_LOAD
-#include "nsIWebBrowserChrome.h"
-#endif
-#include "nsWeakReference.h"
-#include "nsISupportsArray.h"
-#include "jsapi.h"
-
-enum {
-  XML_HTTP_REQUEST_INITIALIZED,
-  XML_HTTP_REQUEST_OPENED,
-  XML_HTTP_REQUEST_SENT,
-  XML_HTTP_REQUEST_COMPLETED,
-  XML_HTTP_REQUEST_ABORTED
-};
-
-class nsXMLHttpRequest : public nsIXMLHttpRequest,
-                         public nsIDOMLoadListener,
-                         public nsIDOMEventTarget,
-                         public nsISecurityCheckedComponent,
-                         public nsIStreamListener,
-                         public nsSupportsWeakReference
-{
-public:
-  nsXMLHttpRequest();
-  virtual ~nsXMLHttpRequest();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIXMLHttpRequest  
-  NS_DECL_NSIXMLHTTPREQUEST
-
-  // nsIDOMEventTarget
-  NS_DECL_NSIDOMEVENTTARGET
-
-  // nsIDOMEventListener
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
-
-  // nsIDOMLoadListener
-  NS_IMETHOD Load(nsIDOMEvent* aEvent);
-  NS_IMETHOD Unload(nsIDOMEvent* aEvent);
-  NS_IMETHOD Abort(nsIDOMEvent* aEvent);
-  NS_IMETHOD Error(nsIDOMEvent* aEvent);
-
-  // nsISecurityCheckedComponent
-  NS_DECL_NSISECURITYCHECKEDCOMPONENT
-
-  // nsIStreamListener
-  NS_DECL_NSISTREAMLISTENER
-
-  // nsIRequestObserver
-  NS_DECL_NSIREQUESTOBSERVER
-
-protected:
-  nsresult MakeScriptEventListener(nsISupports* aObject,
-                                   nsIDOMEventListener** aListener);
-  void GetScriptEventListener(nsISupportsArray* aList, 
-                              nsIDOMEventListener** aListener);
-  PRBool StuffReturnValue(nsIDOMEventListener* aListener);
-
-
-  nsresult GetStreamForWString(const PRUnichar* aStr,
-                               PRInt32 aLength,
-                               nsIInputStream** aStream);
-
-  nsCOMPtr<nsISupports> mContext;
-  nsCOMPtr<nsIHttpChannel> mChannel;
-  nsCOMPtr<nsIRequest> mReadRequest;
-  nsCOMPtr<nsIDOMDocument> mDocument;
-  nsCOMPtr<nsIURI> mBaseURI;
-  nsCOMPtr<nsIDocument> mBaseDocument;
-#ifdef IMPLEMENT_SYNC_LOAD
-  nsCOMPtr<nsIWebBrowserChrome> mChromeWindow;
-#endif
-  nsCOMPtr<nsISupportsArray> mLoadEventListeners;
-  nsCOMPtr<nsISupportsArray> mErrorEventListeners;
-  
-  nsresult DetectCharset(nsAWritableString& aCharset);
-  nsresult ConvertBodyToText(PRUnichar **aOutBuffer);
-  static NS_METHOD StreamReaderFunc(nsIInputStream* in,
-                void* closure,
-                const char* fromRawSegment,
-                PRUint32 toOffset,
-                PRUint32 count,
-                PRUint32 *writeCount);
-
-  // used to implement getAllResponseHeaders()
-  class nsHeaderVisitor : public nsIHttpHeaderVisitor {
-  public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIHTTPHEADERVISITOR
-    nsHeaderVisitor() { NS_INIT_ISUPPORTS(); }
-    virtual ~nsHeaderVisitor() {}
-    const nsACString &Headers() { return mHeaders; }
-  private:
-    nsCString mHeaders;
-  };
-
-#if 1 // When nsCString::Append()/Length() works for strings that contain nulls, remove this buffer impl
-  class ResponseBodyBuffer {
-  public:
-    ResponseBodyBuffer() 
-      : mBuffer(0), 
-        mBufferSize(0), 
-        mBufferFreeIndex(0), 
-        mCanBeString(PR_FALSE), 
-        mBufferChecked(PR_FALSE) {}
-    ~ResponseBodyBuffer() { nsMemory::Free(mBuffer); }
-    void Truncate(void) {
-      nsMemory::Free(mBuffer);
-      mBuffer=nsnull;
-      mBufferSize=mBufferFreeIndex=0;
-      mCanBeString = PR_FALSE;
-      mBufferChecked = PR_FALSE;
-    }
-    nsresult Append(const char* aBuffer, PRUint32 aBufferLen) {
-      if (aBufferLen > (mBufferSize-mBufferFreeIndex)) {
-        PRUint32 newBufferSize = (mBufferSize > aBufferLen ? mBufferSize : aBufferLen)<<1;
-        char * newBuffer = NS_STATIC_CAST(char*,nsMemory::Realloc(mBuffer,newBufferSize));
-        if (!newBuffer) {
-          nsMemory::Free(mBuffer);
-          mBuffer = nsnull;
-          mBufferChecked = PR_FALSE;
-          mCanBeString = PR_FALSE;
-          return NS_ERROR_OUT_OF_MEMORY;
-        }
-        mBuffer = newBuffer;
-        mBufferSize = newBufferSize;
-      }
-      memcpy(&mBuffer[mBufferFreeIndex],aBuffer,aBufferLen);
-      mBufferFreeIndex += aBufferLen;
-      mBufferChecked = PR_FALSE;
-      mCanBeString = PR_FALSE;
-      return NS_OK;
-    }
-    const char * GetBuffer(void) { return mBuffer; }
-    PRUint32 GetBufferLength(void) { return mBufferFreeIndex; }
-    PRBool CanBeString(void) {
-      if (!mBufferFreeIndex)
-        return PR_TRUE; // Perhaps this is a bit questionable...
-      if (!mBufferChecked) {
-        mBufferChecked = PR_TRUE;
-
-        mCanBeString = PR_TRUE;
-
-        PRUint32 i;
-        for (i = 0; i < mBufferFreeIndex; i++) {
-          if (!mBuffer[i]) {
-            mCanBeString = PR_FALSE;
-            break;
-          }
-        }
-      }
-      return mCanBeString;
-    }
-  private:
-    char *mBuffer;
-    PRUint32 mBufferSize;
-    PRUint32 mBufferFreeIndex;
-    PRPackedBool mCanBeString;
-    PRPackedBool mBufferChecked;
-  };
-  ResponseBodyBuffer mResponseBody;
-#else
-  nsCString mResponseBody;
-#endif
-  
-  nsCOMPtr<nsIStreamListener> mXMLParserStreamListener;
-
-  PRInt32 mStatus;
-  PRBool mAsync;
-};
-
-#define NS_IPRIVATEJSEVENTLISTENER_IID              \
- { /* d47a6550-4327-11d4-9a45-000064657374 */       \
-  0xd47a6550, 0x4327, 0x11d4,                       \
- {0x9a, 0x45, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74} }
-
-class nsIPrivateJSEventListener : public nsISupports {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPRIVATEJSEVENTLISTENER_IID)
-    
-  NS_IMETHOD GetFunctionObj(JSObject** aObj) = 0;
-};
-
-class nsXMLHttpRequestScriptListener : public nsIDOMEventListener,
-                                       public nsIPrivateJSEventListener
-{
-public:
-  nsXMLHttpRequestScriptListener(JSObject* aScopeObj, JSObject* aFunctionObj);
-  virtual ~nsXMLHttpRequestScriptListener();
-
-  NS_DECL_ISUPPORTS
-  
-  // nsIDOMEventListener
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
-
-  // nsIPrivateJSEventListener
-  NS_IMETHOD GetFunctionObj(JSObject** aObj);
-  
-protected:  
-  JSObject* mScopeObj;
-  JSObject* mFunctionObj;
-};
-
-#endif

mozilla/gfx/src/nsImageNetContextAsync.cpp

@@ -1,907 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- */
-
-#include "libimg.h"
-#include "nsImageNet.h"
-#include "ilINetContext.h"
-#include "ilIURL.h"
-#include "ilINetReader.h"
-#include "ilErrors.h"
-#include "nsIStreamListener.h"
-#include "nsIInputStream.h"
-#include "nsIURL.h"
-#include "nsILoadGroup.h"
-#include "nsIChannel.h"
-#include "nsCOMPtr.h"
-#include "nsWeakPtr.h"
-#include "prprf.h"
-
-
-#include "nsITimer.h"
-#include "nsVoidArray.h"
-#include "nsString.h"
-#include "prmem.h"
-#include "plstr.h"
-
-#include "nsNetUtil.h"
-
-#include "nsCURILoader.h"
-#include "nsIURIContentListener.h"
-#include "nsIHttpChannel.h"
-#include "nsIStreamConverterService.h"
-#include "nsIPref.h"
-
-static NS_DEFINE_CID(kStreamConvServiceCID, NS_STREAMCONVERTERSERVICE_CID);
-static NS_DEFINE_IID(kIURLIID, NS_IURL_IID);
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-
-PRLogModuleInfo *image_net_context_async_log_module = NULL;
-
-#define IMAGE_BUF_SIZE 4096
-
-class ImageConsumer;
-
-class ImageNetContextImpl : public ilINetContext {
-public:
-  ImageNetContextImpl(ImgCachePolicy aReloadPolicy,
-                      nsISupports * aLoadContext,
-                      nsReconnectCB aReconnectCallback,
-                      void* aReconnectArg);
-  virtual ~ImageNetContextImpl();
-
-  NS_DECL_ISUPPORTS
-
-  virtual ilINetContext* Clone();
-
-  virtual ImgCachePolicy GetReloadPolicy();
-  virtual ImgCachePolicy SetReloadPolicy(ImgCachePolicy ReloadPolicy);
-
-
-  virtual void AddReferer(ilIURL *aUrl);
-
-  virtual void Interrupt();
-
-  virtual ilIURL* CreateURL(const char *aUrl, 
-			    ImgCachePolicy aReloadMethod);
-
-  virtual PRBool IsLocalFileURL(char *aAddress);
-#ifdef NU_CACHE
-  virtual PRBool IsURLInCache(ilIURL *aUrl);
-#else /* NU_CACHE */
-  virtual PRBool IsURLInMemCache(ilIURL *aUrl);
-
-  virtual PRBool IsURLInDiskCache(ilIURL *aUrl);
-#endif
-
-  virtual int GetURL (ilIURL * aUrl, ImgCachePolicy aLoadMethod,
-		      ilINetReader *aReader, PRBool IsAnimationLoop);
-
-  virtual int GetContentLength(ilIURL * aURL);
-
-  nsresult RemoveRequest(ImageConsumer *aConsumer);
-  nsresult RequestDone(ImageConsumer *aConsumer, nsIRequest* request,
-                   nsISupports* ctxt, nsresult status, const PRUnichar* aMsg);
-
-  nsVoidArray *mRequests; // WEAK references to |ImageConsumer|s
-  ImgCachePolicy mReloadPolicy;
-  nsWeakPtr mLoadContext;
-  nsReconnectCB mReconnectCallback;
-  void* mReconnectArg;
-};
-
-class ImageConsumer : public nsIStreamListener, public nsIURIContentListener, public nsIInterfaceRequestor
-{
-public:
-  NS_DECL_ISUPPORTS
-  
-  ImageConsumer(ilIURL *aURL, ImageNetContextImpl *aContext);
-  
-  // nsIRequestObserver methods:
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSIURICONTENTLISTENER
-  NS_DECL_NSIINTERFACEREQUESTOR
-
-  void SetKeepPumpingData(nsIRequest* request, nsISupports* context) {
-    NS_ADDREF(request);
-    NS_IF_RELEASE(mRequest);
-    mRequest = request;
-
-    NS_IF_ADDREF(context);
-    NS_IF_RELEASE(mUserContext);
-    mUserContext = context;
-  }
-  
-  void Interrupt();
-
-  static void KeepPumpingStream(nsITimer *aTimer, void *aClosure);
-
-protected:
-  virtual ~ImageConsumer();
-  ilIURL *mURL;
-  PRBool mInterrupted;
-  ImageNetContextImpl *mContext;
-  nsIInputStream *mStream;
-  nsCOMPtr<nsITimer> mTimer;
-  PRBool mFirstRead;
-  char *mBuffer;
-  PRInt32 mStatus;
-  nsIRequest* mRequest;
-  nsISupports* mUserContext;
-  PRBool mIsMulti;
-};
-
-ImageConsumer::ImageConsumer(ilIURL *aURL, ImageNetContextImpl *aContext)
-{
-  NS_INIT_REFCNT();
-  mURL = aURL;
-  NS_ADDREF(mURL);
-  mContext = aContext;
-  NS_ADDREF(mContext);
-  mInterrupted = PR_FALSE;
-  mFirstRead = PR_TRUE;
-  mStream = nsnull;
-  mBuffer = nsnull;
-  mStatus = 0;
-  mRequest = nsnull;
-  mUserContext = nsnull;
-  mIsMulti = PR_FALSE;
-}
-
-NS_IMPL_THREADSAFE_ADDREF(ImageConsumer)
-NS_IMPL_THREADSAFE_RELEASE(ImageConsumer)
-
-NS_INTERFACE_MAP_BEGIN(ImageConsumer)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURIContentListener)
-   NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
-   NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
-   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-   NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
-NS_INTERFACE_MAP_END
-
-NS_IMETHODIMP ImageConsumer::GetInterface(const nsIID & aIID, void * *aInstancePtr)
-{
-   NS_ENSURE_ARG_POINTER(aInstancePtr);
-   return QueryInterface(aIID, aInstancePtr);
-}
-
-// nsIURIContentListener support
-
-NS_IMETHODIMP 
-ImageConsumer::OnStartURIOpen(nsIURI* aURI, 
-   const char* aWindowTarget, PRBool* aAbortOpen)
-{
-   return NS_OK;
-}
-
-NS_IMETHODIMP
-ImageConsumer::GetProtocolHandler(nsIURI *aURI, nsIProtocolHandler **aProtocolHandler)
-{
-  *aProtocolHandler = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-ImageConsumer::GetParentContentListener(nsIURIContentListener** aParent)
-{
-  *aParent = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-ImageConsumer::SetParentContentListener(nsIURIContentListener* aParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-ImageConsumer::GetLoadCookie(nsISupports ** aLoadCookie)
-{
-  nsCOMPtr<nsISupports> loadContext = do_QueryReferent(mContext->mLoadContext);
-  *aLoadCookie = loadContext;
-  NS_IF_ADDREF(*aLoadCookie);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-ImageConsumer::SetLoadCookie(nsISupports * aLoadCookie)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-ImageConsumer::IsPreferred(const char * aContentType,
-                                nsURILoadCommand aCommand,
-                                const char * aWindowTarget,
-                                char ** aDesiredContentType,
-                                PRBool * aCanHandleContent)
-
-{
-  return CanHandleContent(aContentType, aCommand, aWindowTarget, 
-                          aDesiredContentType, aCanHandleContent);
-}
-
-NS_IMETHODIMP 
-ImageConsumer::CanHandleContent(const char * aContentType,
-                                nsURILoadCommand aCommand,
-                                const char * aWindowTarget,
-                                char ** aDesiredContentType,
-                                PRBool * aCanHandleContent)
-
-{
-  // if we had a webshell or doc shell around, we'd pass this call
-  // through to it...but we don't =(
-  if (!nsCRT::strcasecmp(aContentType, "message/rfc822"))
-    *aDesiredContentType = nsCRT::strdup("application/vnd.mozilla.xul+xml");
-  // since we explicilty loaded the url, we always want to handle it!
-  *aCanHandleContent = PR_TRUE;
-    
-  return NS_OK;
-} 
-
-NS_IMETHODIMP 
-ImageConsumer::DoContent(const char * aContentType,
-                      nsURILoadCommand aCommand,
-                      const char * aWindowTarget,
-                      nsIRequest * aOpenedChannel,
-                      nsIStreamListener ** aContentHandler,
-                      PRBool * aAbortProcess)
-{
-  nsresult rv = NS_OK;
-  if (aAbortProcess)
-    *aAbortProcess = PR_FALSE;
-
-  nsAutoString contentType; contentType.AssignWithConversion(aContentType);
-
-  if (contentType.EqualsWithConversion("multipart/x-mixed-replace")
-      || contentType.EqualsWithConversion("multipart/mixed")) {
-    // if we're getting multipart data, we have to convert it.
-    // so wedge the converter inbetween us and the consumer.
-    mIsMulti= PR_TRUE;
-
-    nsCOMPtr<nsIStreamConverterService> convServ = do_GetService(kStreamConvServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsAutoString astrix; astrix.AssignWithConversion("*/*");
-    return convServ->AsyncConvertData(contentType.GetUnicode(),
-                                   astrix.GetUnicode(),
-                                   NS_STATIC_CAST(nsIStreamListener*, this),
-                                   nsnull /*a context?*/, aContentHandler);
-  }
-
-  QueryInterface(NS_GET_IID(nsIStreamListener), (void **) aContentHandler);
-  return rv;
-}
-
-
-NS_IMETHODIMP
-ImageConsumer::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
-{
-    nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
-
-  PRUint32 httpStatus;
-  if (mInterrupted) {
-    mStatus = MK_INTERRUPTED;
-    return NS_ERROR_ABORT;
-  }
-
-  mBuffer = (char *)PR_MALLOC(IMAGE_BUF_SIZE);
-  if (mBuffer == nsnull) {
-    mStatus = MK_IMAGE_LOSSAGE;
-    return NS_ERROR_ABORT;
-  }
-
-  nsCOMPtr<nsIHttpChannel> pHTTPCon(do_QueryInterface(channel));
-  if (pHTTPCon) {
-    pHTTPCon->GetResponseStatus(&httpStatus);
-    if (httpStatus == 404) {
-      mStatus = MK_IMAGE_LOSSAGE;
-      return NS_ERROR_ABORT;
-    }
-  }
-
-  ilINetReader *reader = mURL->GetReader(); //ptn test: nsCOMPtr??
-  /*nsresult err=*/ reader->FlushImgBuffer(); //flush current data in buffer before starting 
-
-  nsresult rv = NS_OK;
-  char* aContentType = NULL;
-  rv = channel->GetContentType(&aContentType); //nsCRT alloc's str
-  if (NS_FAILED(rv)) {
-      if(aContentType){
-          nsCRT::free(aContentType);
-      }
-      aContentType = nsCRT::strdup("unknown");        
-  }
-  if(nsCRT::strlen(aContentType) > 50){
-      //somethings wrong. mimetype string shouldn't be this big.
-      //protect us from the user.
-      nsCRT::free(aContentType);
-      aContentType = nsCRT::strdup("unknown"); 
-  }
-
-  if (reader->StreamCreated(mURL, aContentType) != PR_TRUE) {
-    mStatus = MK_IMAGE_LOSSAGE;
-    reader->StreamAbort(mStatus);
-    NS_RELEASE(reader);
-    nsCRT::free(aContentType);
-    return NS_ERROR_ABORT;
-  }
-  nsCRT::free(aContentType);
-  NS_RELEASE(reader);
-    
-  return NS_OK;
-}
-
-#define IMAGE_BUF_SIZE 4096
-
-
-NS_IMETHODIMP
-ImageConsumer::OnDataAvailable(nsIRequest* request, nsISupports* aContext,
-        nsIInputStream *pIStream, PRUint32 offset, PRUint32 length)
-{
-  PRUint32 max_read=0;
-  PRUint32 bytes_read = 0;
-  ilINetReader *reader = mURL->GetReader();
-
-    nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
-
-  if (mInterrupted || mStatus != 0) {
-    mStatus = MK_INTERRUPTED;
-    reader->StreamAbort(mStatus);
-    NS_RELEASE(reader);
-    return NS_ERROR_ABORT;
-  }
-
-  nsresult err = 0;
-  PRUint32 nb = 0;
-  char* uriStr = NULL;
-  nsCOMPtr<nsIURI> uri;
-
-  err = channel->GetURI(getter_AddRefs(uri));
-  if (NS_SUCCEEDED(err) && uri) {
-      err = uri->GetSpec(&uriStr);
-      if (NS_FAILED(err)){
-          /* if we can't get a file spec, it is bad, very bad.*/
-          mStatus = MK_INTERRUPTED;
-          reader->StreamAbort(mStatus);
-          NS_RELEASE(reader);
-          return NS_ERROR_ABORT;
-      }
-  }
-
-  do {
-    err = reader->WriteReady(&max_read); //max read is most decoder can handle
-    if(NS_FAILED(err))   //note length tells how much we already have.
-        break;
-
-    if(max_read < 0){
-            max_read = 128;
-    }
-
-    if (max_read > (length - bytes_read)) {
-      max_read = length - bytes_read;
-    }
-
-    if (max_read > IMAGE_BUF_SIZE) {
-      max_read = IMAGE_BUF_SIZE;
-    }
-    
-    // make sure there's enough data available to decode the image.
-    // put test into WriteReady
-    if (mFirstRead && length < 4)
-      break;
-
-    err = pIStream->Read(mBuffer,
-                         max_read, &nb);
-
-    if (err == NS_BASE_STREAM_WOULD_BLOCK) {
-      NS_ASSERTION(nb == 0, "Data will be lost.");
-      err = NS_OK;
-      break;
-    }
-    if (NS_FAILED(err) || nb == 0) {
-      NS_ASSERTION(nb == 0, "Data will be lost.");
-      break;
-    }
-
-    bytes_read += nb;
-    if (mFirstRead == PR_TRUE) {
-            
-      err = reader->FirstWrite((const unsigned char *)mBuffer, nb, uriStr);
-      mFirstRead = PR_FALSE; //? move after err chk?
-      /* 
-       * If FirstWrite(...) fails then the image type
-       * cannot be determined and the il_container 
-       * stream functions have not been initialized!
-       */
-      if (NS_FAILED(err)) {
-        mStatus = MK_IMAGE_LOSSAGE;
-        mInterrupted = PR_TRUE;
-        if(uriStr)
-	        nsCRT::free(uriStr);
-	    NS_RELEASE(reader);
-        return NS_ERROR_ABORT;
-      }
-    }
-
-    err = reader->Write((const unsigned char *)mBuffer, (int32)nb);
-    if(NS_FAILED(err)){
-      mStatus = MK_IMAGE_LOSSAGE;
-      mInterrupted = PR_TRUE;
-      if(uriStr)
-	      nsCRT::free(uriStr);
-	  NS_RELEASE(reader);
-      return NS_ERROR_ABORT;
-    }
-  } while(bytes_read < length);
-
-  if (uriStr) {
-	nsCRT::free(uriStr);
-  }
-
-  if (NS_FAILED(err)) {
-    mStatus = MK_IMAGE_LOSSAGE;
-    mInterrupted = PR_TRUE;
-  }
-
-  if (bytes_read < length) {
-    // If we haven't emptied the stream, hold onto it, because
-    // we will need to read from it subsequently and we don't
-    // know if we'll get a OnDataAvailable call again.
-    //
-    // Addref the new stream before releasing the old one,
-    // in case it is the same stream!
-    NS_ADDREF(pIStream);
-    NS_IF_RELEASE(mStream);
-    mStream = pIStream;
-  } else {
-    NS_IF_RELEASE(mStream);
-  }
-  NS_RELEASE(reader);
-  return NS_OK;
-}
-
-void
-ImageConsumer::KeepPumpingStream(nsITimer *aTimer, void *aClosure)
-{
-  ImageConsumer *consumer = (ImageConsumer *)aClosure;
-
-  consumer->OnStopRequest(consumer->mRequest, consumer->mUserContext,
-                          NS_BINDING_SUCCEEDED);
-}
-
-NS_IMETHODIMP
-ImageConsumer::OnStopRequest(nsIRequest* request, nsISupports* aContext, nsresult status)
-{
-  if (mTimer) {
-    mTimer->Cancel();
-    mTimer = nsnull;
-  }
-
-  if (NS_BINDING_SUCCEEDED != status) {
-    mStatus = MK_INTERRUPTED;
-  }
-
- 
-  // Since we're still holding on to the stream, there's still data
-  // that needs to be read. So, pump the stream ourselves.
-  if((mStream != nsnull) && (status == NS_BINDING_SUCCEEDED)) {
-    PRUint32 str_length;
-    nsresult err = mStream->Available(&str_length);
-    if (NS_SUCCEEDED(err)) {
-      NS_ASSERTION((str_length > 0), "No data left in the stream!");
-      err = OnDataAvailable(request, aContext, mStream, 0, str_length);  // XXX fix offset
-      if (NS_SUCCEEDED(err)) {
-        // If we still have the stream, there's still data to be 
-        // pumped, so we set a timer to call us back again.
-        if (mStream) {
-          SetKeepPumpingData(request, aContext);
-
-          nsresult rv;
-          mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
-          if (NS_FAILED(rv) ||
-              (NS_OK != mTimer->Init(ImageConsumer::KeepPumpingStream, this, 0))) {
-            mStatus = MK_IMAGE_LOSSAGE;
-            NS_RELEASE(mStream);
-          }
-          else {
-            return NS_OK;
-          }
-        }
-      }
-      else {
-        mStatus = MK_IMAGE_LOSSAGE;
-        NS_IF_RELEASE(mStream);
-      }
-    }
-    else {
-      mStatus = MK_IMAGE_LOSSAGE;
-      NS_IF_RELEASE(mStream);
-    }
-  }
-
-  ilINetReader *reader = mURL->GetReader();
-  if (0 != mStatus) {
-    reader->StreamAbort(mStatus);
-  }
-  else {
-    reader->StreamComplete(mIsMulti);
-  }
-
-  if(mIsMulti)
-        mFirstRead = PR_TRUE;  //reset to read new frame
-
-  reader->NetRequestDone(mURL, mStatus);
-  NS_RELEASE(reader);
-  
-  return mContext->RequestDone(this, request, aContext, status, nsnull);
-}
-
-void
-ImageConsumer::Interrupt()
-{
-  mInterrupted = PR_TRUE;
-}
-
-ImageConsumer::~ImageConsumer()
-{
-  if (mTimer) {
-    mTimer->Cancel();
-    mTimer = nsnull;
-  }
-  if (mContext) {
-    nsresult res = mContext->RemoveRequest(this);
-    if (NS_SUCCEEDED(res)) {
-      // The load was canceled.
-      mStatus = MK_INTERRUPTED;
-      if (mURL) {
-        nsCOMPtr<ilINetReader> reader( dont_AddRef( mURL->GetReader() ) );
-        reader->StreamAbort(mStatus);
-        reader->NetRequestDone(mURL, mStatus);
-      }
-    }
-    NS_RELEASE(mContext);
-  }
-  NS_IF_RELEASE(mURL);
-  NS_IF_RELEASE(mStream);
-  if (mBuffer != nsnull) {
-    PR_DELETE(mBuffer);
-  }
-  NS_IF_RELEASE(mRequest);
-  NS_IF_RELEASE(mUserContext);
-}
-
-ImageNetContextImpl::ImageNetContextImpl(ImgCachePolicy aReloadPolicy,
-                                         nsISupports * aLoadContext,
-                                         nsReconnectCB aReconnectCallback,
-                                         void* aReconnectArg)
-{
-  NS_INIT_REFCNT();
-  mRequests = nsnull;
-  mLoadContext = getter_AddRefs(NS_GetWeakReference(aLoadContext));
-  mReloadPolicy = aReloadPolicy;
-  mReconnectCallback = aReconnectCallback;
-  mReconnectArg = aReconnectArg;
-}
-
-ImageNetContextImpl::~ImageNetContextImpl()
-{
-  delete mRequests;
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(ImageNetContextImpl, ilINetContext)
-
-ilINetContext* 
-ImageNetContextImpl::Clone()
-{
-  ilINetContext *cx;
-  nsCOMPtr<nsISupports> loadContext = do_QueryReferent(mLoadContext);
-
-  //mReconnectArg is ImageGroup. If GetURL is triggered
-  //by timer for animation, ImageGroup may have been unloaded
-  //before timer kicks off.
-  //mReconnectCallback=nsnull; mReconnectArg=nsnull;
-
-  if (NS_NewImageNetContext(&cx, loadContext, mReconnectCallback, mReconnectArg) == NS_OK)
-  {
-    return cx;
-  }
-  else {
-    return nsnull;
-  }
-}
-
-ImgCachePolicy 
-ImageNetContextImpl::GetReloadPolicy()
-{
-  return mReloadPolicy;
-}
-
-ImgCachePolicy 
-ImageNetContextImpl::SetReloadPolicy(ImgCachePolicy reloadpolicy)
-{
-  mReloadPolicy=reloadpolicy;
-  return mReloadPolicy;
-}
-
-void 
-ImageNetContextImpl::AddReferer(ilIURL *aUrl)
-{
-}
-
-void 
-ImageNetContextImpl::Interrupt()
-{
-  if (mRequests != nsnull) {
-    int i, count = mRequests->Count();
-    for (i=0; i < count; i++) {
-      ImageConsumer *ic = (ImageConsumer *)mRequests->ElementAt(i);
-      ic->Interrupt();
-    }
-  }
-}
-
-ilIURL* 
-ImageNetContextImpl::CreateURL(const char *aURL, 
-                               ImgCachePolicy aReloadMethod)
-{
-  ilIURL *url;
- 
-  nsCOMPtr<nsISupports> loadContext (do_QueryReferent(mLoadContext)); 
-  nsCOMPtr<nsILoadGroup> group (do_GetInterface(loadContext));
-  if (NS_NewImageURL(&url, aURL, group) == NS_OK)
-  {
-    return url;
-  }
-  else {
-    return nsnull;
-  }
-}
-
-PRBool 
-ImageNetContextImpl::IsLocalFileURL(char *aAddress)
-{
-  if (PL_strncasecmp(aAddress, "file:", 5) == 0) {
-    return PR_TRUE;
-  }
-  else {
-    return PR_FALSE;
-  }
-}
-
-#ifdef NU_CACHE
-PRBool 
-ImageNetContextImpl::IsURLInCache(ilIURL *aUrl)
-{
-  return PR_TRUE;
-}
-#else /* NU_CACHE */
-PRBool 
-ImageNetContextImpl::IsURLInMemCache(ilIURL *aUrl)
-{
-  return PR_FALSE;
-}
-
-PRBool 
-ImageNetContextImpl::IsURLInDiskCache(ilIURL *aUrl)
-{
-  return PR_TRUE;
-}
-#endif /* NU_CACHE */
-
-int 
-ImageNetContextImpl::GetContentLength (ilIURL * aURL)
-{
-    return -1;
-}
-
-
-int 
-ImageNetContextImpl::GetURL (ilIURL * aURL, 
-                             ImgCachePolicy aLoadMethod,
-                             ilINetReader *aReader,
-                             PRBool IsAnimationLoop)
-{
-
-
-  NS_PRECONDITION(nsnull != aURL, "null URL");
-  NS_PRECONDITION(nsnull != aReader, "null reader");
-  if (aURL == nsnull || aReader == nsnull) {
-    return -1;
-  }
-
-  if (mRequests == nsnull) {
-    mRequests = new nsVoidArray();
-    if (mRequests == nsnull) {
-      // XXX Should still call exit function
-      return -1;
-    }
-  }
-
-  int ret;
-  nsresult rv;
-  nsCOMPtr<nsIURI> nsurl = do_QueryInterface(aURL, &rv);
-  if (NS_FAILED(rv)) return 0;
-
-  aURL->SetReader(aReader);
-  SetReloadPolicy(aLoadMethod); 
- 
-  
-  // Find previously created ImageConsumer if possible
-  ImageConsumer *ic = new ImageConsumer(aURL, this);
-  if (ic == nsnull)
-    return -1;
-  NS_ADDREF(ic);
-        
-  // See if a reconnect is being done...(XXX: hack!)
-  if (mReconnectCallback == nsnull
-      || !(*mReconnectCallback)(mReconnectArg, ic)) {
-    // first, create a channel for the protocol....
-    nsCOMPtr<nsIChannel> channel;
-    nsCOMPtr<nsISupports> loadContext (do_QueryReferent(mLoadContext)); 
-    nsCOMPtr<nsILoadGroup> group (do_GetInterface(loadContext));
-    nsCOMPtr<nsIInterfaceRequestor> sink(do_QueryInterface(loadContext));
-
-   nsLoadFlags flags=0;   
-   if(IsAnimationLoop)
-       flags |= nsIRequest::LOAD_FROM_CACHE;
-
-    rv = NS_OpenURI(getter_AddRefs(channel), nsurl, nsnull, group, sink, flags);
-    if (NS_FAILED(rv)) goto error;
-
-    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
-    if (httpChannel)
-    {
-        // Get the defloadRequest from the loadgroup-
-        nsCOMPtr<nsIRequest> defLoadRequest;
-        if (NS_SUCCEEDED(group->GetDefaultLoadRequest(
-                        getter_AddRefs(defLoadRequest))) && defLoadRequest)
-        {
-            nsCOMPtr<nsIChannel> reqchannel = do_QueryInterface(defLoadRequest);
-
-            // Get the referrer from the loadchannel-
-            nsCOMPtr<nsIURI> referrer;
-            if (NS_SUCCEEDED(reqchannel->GetURI(getter_AddRefs(referrer))))
-            {
-                // Set the referrer-
-                httpChannel->SetReferrer(referrer, nsIHttpChannel::REFERRER_INLINES);
-            }
-        }
-    }
-
-
-    rv = channel->GetLoadFlags(&flags);
-    if (NS_FAILED(rv)) goto error;
-
-   if (aURL->GetBackgroundLoad()) 
-      flags |= nsIRequest::LOAD_BACKGROUND;
-       
-   (void)channel->SetLoadFlags(flags);
-
-   nsCOMPtr<nsISupports> window (do_QueryInterface(NS_STATIC_CAST(nsIStreamListener *, ic)));
-
-    // let's try uri dispatching...
-    nsCOMPtr<nsIURILoader> pURILoader (do_GetService(NS_URI_LOADER_CONTRACTID, &rv));
-    if (NS_SUCCEEDED(rv)) 
-    {
-      nsURILoadCommand loadCmd = nsIURILoader::viewNormal;
-      PRBool bIsBackground = aURL->GetBackgroundLoad();
-      if (bIsBackground) {
-        loadCmd = nsIURILoader::viewNormalBackground;
-      }
-
-
-      rv = pURILoader->OpenURI(channel, loadCmd, nsnull /* window target */, 
-                               window);
-    }
-    // rv = channel->AsyncOpen(ic, nsnull);
-    if (NS_FAILED(rv)) goto error;
-  }
-
-  ret = mRequests->AppendElement((void *)ic) ? 0 : -1;
-  NS_RELEASE(ic); // if nothing else is holding onto it, it will remove
-                  // itself from mRequests
-  return ret;
-
-error:
-  NS_RELEASE(ic);
-  return -1;
-}
-
-nsresult
-ImageNetContextImpl::RemoveRequest(ImageConsumer *aConsumer)
-{
-  nsresult rv = NS_OK;
-  if (mRequests) {
-    rv = mRequests->RemoveElement((void *)aConsumer)?NS_OK:NS_ERROR_FAILURE;
-  }
-  return rv;
-}
-
-nsresult
-ImageNetContextImpl::RequestDone(ImageConsumer *aConsumer, nsIRequest* request,
-                 nsISupports* ctxt, nsresult status, const PRUnichar* aMsg)
-{
-  RemoveRequest(aConsumer);
-///  if (mLoadGroup)
-///    return mLoadGroup->RemoveChannel(channel, ctxt, status, aMsg);
-///  else
-    return NS_OK;
-}
-
-extern "C" NS_GFX_(nsresult)
-NS_NewImageNetContext(ilINetContext **aInstancePtrResult,
-                      nsISupports * aLoadContext, 
-                      nsReconnectCB aReconnectCallback,
-                      void* aReconnectArg)
-{
-     
-  PRUint32  necko_attribs;
-  ImgCachePolicy imglib_attribs = USE_IMG_CACHE;
-  nsLoadFlags defchan_attribs = nsIRequest::LOAD_NORMAL;
-
-  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-  if (nsnull == aInstancePtrResult) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  if(aLoadContext){
-     nsCOMPtr<nsILoadGroup> group (do_GetInterface(aLoadContext));
-     /*nsresult rv = */group->GetLoadFlags(&necko_attribs);
-/*
-Need code to check freshness of necko cache.
-*/
-     nsCOMPtr<nsIRequest> defLoadRequest; 
-     nsCOMPtr<nsIChannel> channel;
-     if (NS_SUCCEEDED(group->GetDefaultLoadRequest(
-                        getter_AddRefs(defLoadRequest))) && defLoadRequest)
-     {
-         channel = do_QueryInterface(defLoadRequest);
-         if (channel) channel->GetLoadFlags(&defchan_attribs);
-     }
-
-#if defined( DEBUG )
-     if (image_net_context_async_log_module == NULL) {
-    	image_net_context_async_log_module = PR_NewLogModule("IMAGENETCTXASYNC");
-     }          
-#endif
-     if((nsIRequest::VALIDATE_ALWAYS & defchan_attribs)||   
-        (nsIRequest::INHIBIT_PERSISTENT_CACHING & defchan_attribs)||
-        (nsIRequest::LOAD_BYPASS_CACHE & defchan_attribs)) {
-     		imglib_attribs = DONT_USE_IMG_CACHE;
-#if defined( DEBUG )
-		PR_LOG(image_net_context_async_log_module, 1, ("ImageNetContextAsync: NS_NewImageNetContext: DONT_USE_IMAGE_CACHE\n"));
-#endif
-     }
-  }
-
-  ilINetContext *cx = new ImageNetContextImpl( imglib_attribs,
-                                              aLoadContext,
-                                              aReconnectCallback,
-                                              aReconnectArg);
-  if (cx == nsnull) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return cx->QueryInterface(NS_GET_IID(ilINetContext), (void **) aInstancePtrResult);
-
-}

mozilla/intl/chardet/src/nsObserverBase.cpp

@@ -1,106 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-//#define DONT_INFORM_WEBSHELL
-
-#include "nsIServiceManager.h"
-#include "nsIDocumentLoader.h"
-#include "nsIWebShellServices.h"
-#include "nsIContentViewerContainer.h"
-#include "nsCURILoader.h"
-#include "nsObserverBase.h"
-#include "nsIParser.h"
-#include "nsString.h"
-#include "nsIDocShell.h"
-#include "nsIHttpChannel.h"
-#include "nsXPIDLString.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-static NS_DEFINE_IID(kDocLoaderServiceCID, NS_DOCUMENTLOADER_SERVICE_CID);
-static NS_DEFINE_IID(kIDocumentLoaderIID, NS_IDOCUMENTLOADER_IID);
-static NS_DEFINE_IID(kIWebShellServicesIID, NS_IWEB_SHELL_SERVICES_IID);
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsObserverBase::NotifyWebShell(
-  nsISupports* aParserBundle, const char* charset, nsCharsetSource source)
-{
-   
-   nsresult rv  = NS_OK;
-
-   nsCOMPtr<nsISupportsParserBundle> bundle=do_QueryInterface(aParserBundle);
-
-   if (bundle) {
-     nsresult res = NS_OK;
-     
-     // XXX - Make sure not to reload POST data to prevent bugs such as 27006
-     nsAutoString theChannelKey;
-     theChannelKey.AssignWithConversion("channel");
-
-     nsCOMPtr<nsIChannel> channel=nsnull;
-     res=bundle->GetDataFromBundle(theChannelKey,getter_AddRefs(channel));
-     if(NS_SUCCEEDED(res)) {
-       nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel,&res));
-       if(NS_SUCCEEDED(res)) {
-         nsXPIDLCString method;
-         httpChannel->GetRequestMethod(getter_Copies(method));
-         if(method) {
-           if(!PL_strcasecmp(method, "POST"))
-             return NS_OK; 
-         }
-       }
-     }
-     
-     nsAutoString theDocShellKey;
-     theDocShellKey.AssignWithConversion("docshell"); // Key to find docshell from the bundle. 
-     
-     nsCOMPtr<nsIDocShell> docshell=nsnull;
- 	     
-     res=bundle->GetDataFromBundle(theDocShellKey,getter_AddRefs(docshell));
-     if(NS_SUCCEEDED(res)) {
-       nsCOMPtr<nsIWebShellServices> wss=nsnull;
-       wss=do_QueryInterface(docshell,&res);  // Query webshell service through docshell.
-       if(NS_SUCCEEDED(res)) {
-
-#ifndef DONT_INFORM_WEBSHELL
-         // ask the webshellservice to load the URL
-         if(NS_FAILED( res = wss->SetRendering(PR_FALSE) ))
-           rv=res;
-
-         // XXX nisheeth, uncomment the following two line to see the reent problem
-
-         else if(NS_FAILED(res = wss->StopDocumentLoad())){
-	         rv = wss->SetRendering(PR_TRUE); // turn on the rendering so at least we will see something.
-         }
-
-         else if(NS_FAILED(res = wss->ReloadDocument(charset, source))) {
-	         rv = wss->SetRendering(PR_TRUE); // turn on the rendering so at least we will see something.
-         }
-         else
-           rv = NS_ERROR_HTMLPARSER_STOPPARSING; // We're reloading a new document...stop loading the current.
-#endif
-
-       }
-     }
-  }
-   return rv;
-}

mozilla/layout/build/gbdate.pl

@@ -1,27 +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): 
-#
-
-# XP way of doing the build date.
-# 1998091509 = 1998, September, 15th, 9am local time zone
-($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
-# localtime returns year minus 1900
-$year = $year + 1900;
-printf("#define PRODUCT_VERSION \"%04d%02d%02d\"\n", $year, 1+$mon, $mday);

mozilla/layout/build/nsContentHTTPStartup.cpp

@@ -1,90 +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 Communicator client 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):
- *   Alec Flett <alecf@netscape.com>
- */
-
-#include "nsIServiceManager.h"
-#include "nsICategoryManager.h"
-
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsXPIDLString.h"
-
-#include "nsContentHTTPStartup.h"
-#include "nsIHttpProtocolHandler.h"
-#include "gbdate.h"
-
-#define PRODUCT_NAME "Gecko"
-
-NS_IMPL_ISUPPORTS1(nsContentHTTPStartup,nsIObserver)
-
-nsresult
-nsContentHTTPStartup::Observe( nsISupports *aSubject,
-                              const PRUnichar *aTopic,
-                              const PRUnichar *aData)
-{
-    if (nsCRT::strcmp(aTopic, NS_HTTP_STARTUP_TOPIC) != 0)
-        return NS_OK;
-    
-    nsresult rv = nsnull;
-
-    nsCOMPtr<nsIHttpProtocolHandler> http(do_QueryInterface(aSubject));
-    if (NS_FAILED(rv)) return rv;
-    
-    rv = http->SetProduct(PRODUCT_NAME);
-    if (NS_FAILED(rv)) return rv;
-    
-    rv = http->SetProductSub((char*) PRODUCT_VERSION);
-    if (NS_FAILED(rv)) return rv;
-    
-    return NS_OK;
-}
-
-nsresult
-nsContentHTTPStartup::RegisterHTTPStartup()
-{
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager>
-        catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  
-    if (NS_FAILED(rv)) return rv;
-
-    nsXPIDLCString previousEntry;
-    rv = catMan->AddCategoryEntry(NS_HTTP_STARTUP_CATEGORY,
-                                  "Content UserAgent Setter",
-                                  NS_CONTENTHTTPSTARTUP_CONTRACTID,
-                                  PR_TRUE, PR_TRUE,
-                                  getter_Copies(previousEntry));
-    return rv;
-}
-
-nsresult
-nsContentHTTPStartup::UnregisterHTTPStartup()
-{
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager>
-        catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  
-    if (NS_FAILED(rv)) return rv;
-
-
-    return NS_OK;
-}

mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp

@@ -1,864 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-#include "msgCore.h" // for pre-compiled headers
-#include "nsCOMPtr.h"
-#include <stdio.h>
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "comi18n.h"
-#include "prmem.h"
-#include "plstr.h"
-#include "nsIPref.h"
-#include "nsRepository.h"
-#include "nsIURI.h"
-#include "nsString.h"
-#include "nsAbSyncPostEngine.h"
-#include "nsIIOService.h"
-#include "nsIChannel.h"
-#include "nsNetUtil.h"
-#include "nsMimeTypes.h"
-#include "nsIHttpChannel.h"
-#include "nsTextFormatter.h"
-#include "nsICookieService.h"
-#include "nsIAbSync.h"
-#include "nsAbSyncCID.h"
-
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID);
-static NS_DEFINE_CID(kCAbSyncMojoCID, NS_AB_SYNC_MOJO_CID);
-static NS_DEFINE_CID(kAbSync, NS_ABSYNC_SERVICE_CID);
-
-/* 
- * This function will be used by the factory to generate an 
- * object class object....
- */
-NS_METHOD
-nsAbSyncPostEngine::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsAbSyncPostEngine *ph = new nsAbSyncPostEngine();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return ph->QueryInterface(aIID, aResult);
-}
-
-NS_IMPL_ADDREF(nsAbSyncPostEngine)
-NS_IMPL_RELEASE(nsAbSyncPostEngine)
-
-NS_INTERFACE_MAP_BEGIN(nsAbSyncPostEngine)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURIContentListener)
-   NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
-   NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
-   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
-   NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
-   NS_INTERFACE_MAP_ENTRY(nsIAbSyncPostEngine)
-NS_INTERFACE_MAP_END
-
-/* 
- * Inherited methods for nsMimeConverter
- */
-nsAbSyncPostEngine::nsAbSyncPostEngine()
-{
-  /* the following macro is used to initialize the ref counting data */
-  NS_INIT_REFCNT();
-
-  // Init member variables...
-  mTotalWritten = 0;
-  mStillRunning = PR_TRUE;
-  mContentType = nsnull;
-  mCharset = nsnull;
-
-  mListenerArray = nsnull;
-  mListenerArrayCount = 0;
-
-  mPostEngineState =  nsIAbSyncPostEngineState::nsIAbSyncPostIdle;
-  mTransactionID = 0;
-  mMessageSize = 0;
-  mAuthenticationRunning = PR_TRUE;
-  mCookie = nsnull;
-  mUser = nsnull;
-  mSyncProtocolRequest = nsnull;
-  mSyncProtocolRequestPrefix = nsnull;
-  mChannel = nsnull;
-  mMojoSyncSpec = nsnull;
-}
-
-nsAbSyncPostEngine::~nsAbSyncPostEngine()
-{
-  mStillRunning = PR_FALSE;
-  PR_FREEIF(mContentType);
-  PR_FREEIF(mCharset);
-
-  PR_FREEIF(mSyncProtocolRequest);
-  PR_FREEIF(mSyncProtocolRequestPrefix);
-  PR_FREEIF(mCookie);
-  PR_FREEIF(mUser);
-  PR_FREEIF(mMojoSyncSpec);
-  DeleteListeners();
-}
-
-PRInt32 Base64Decode_int(const char *in_str, unsigned char *out_str,
-                                PRUint32& decoded_len);
-/* ==================================================================
- * Base64Encode
- *
- * Returns number of bytes that were encoded.
- *
- *   >0   -> OK
- *   -1   -> BAD (output buffer not big enough).
- *
- * ==================================================================
- */
-PRInt32 Base64Encode(const unsigned char *in_str, PRInt32 in_len, char *out_str,
-                               PRInt32 out_len)
-{
-    static unsigned char base64[] =
-    {  
-        /*   0    1    2    3    4    5    6    7   */
-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', /* 0 */
-        'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', /* 1 */
-        'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', /* 2 */
-        'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', /* 3 */
-        'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', /* 4 */
-        'o', 'p', 'q', 'r', 's', 't', 'u', 'v', /* 5 */
-        'w', 'x', 'y', 'z', '0', '1', '2', '3', /* 6 */
-        '4', '5', '6', '7', '8', '9', '+', '/'  /* 7 */
-    };
-    PRInt32 curr_out_len = 0;
-
-    PRInt32 i = 0;
-    unsigned char a, b, c;
-
-    out_str[0] = '\0';
-
-    if (in_len > 0)
-    {
-
-        while (i < in_len)
-        {
-            a = in_str[i];
-            b = (i + 1 >= in_len) ? 0 : in_str[i + 1];
-            c = (i + 2 >= in_len) ? 0 : in_str[i + 2];
-
-            if (i + 2 < in_len)
-            {
-                out_str[curr_out_len++] = (base64[(a >> 2) & 0x3F]);
-                out_str[curr_out_len++] = (base64[((a << 4) & 0x30)
-                                                 + ((b >> 4) & 0xf)]);
-                out_str[curr_out_len++] = (base64[((b << 2) & 0x3c)
-                                                 + ((c >> 6) & 0x3)]);
-                out_str[curr_out_len++] = (base64[c & 0x3F]);
-            }
-            else if (i + 1 < in_len)
-            {
-                out_str[curr_out_len++] = (base64[(a >> 2) & 0x3F]);
-                out_str[curr_out_len++] = (base64[((a << 4) & 0x30)
-                                                 + ((b >> 4) & 0xf)]);
-                out_str[curr_out_len++] = (base64[((b << 2) & 0x3c)
-                                                 + ((c >> 6) & 0x3)]);
-                out_str[curr_out_len++] = '=';
-            }
-            else
-            {
-                out_str[curr_out_len++] = (base64[(a >> 2) & 0x3F]);
-                out_str[curr_out_len++] = (base64[((a << 4) & 0x30)
-                                                 + ((b >> 4) & 0xf)]);
-                out_str[curr_out_len++] = '=';
-                out_str[curr_out_len++] = '=';
-            }
-
-            i += 3;
-
-            if((curr_out_len + 4) > out_len)
-            {
-                return(-1);
-            }
-				
-        }
-        out_str[curr_out_len] = '\0';
-    }
-
-    return curr_out_len;
-}
-
-/*
- * This routine decodes base64 string to a buffer.
- * Populates 'out_str' with b64 decoded data.  
- *
- * Returns number of bytes that were decoded.
- *   >0   -> OK
- *   -1   -> BAD (output buffer not big enough).
- */
-PRInt32 Base64Decode(const char *in_str, unsigned char *out_str,
-                                PRUint32* decoded_len)
-{
-  return Base64Decode_int(in_str, out_str, *decoded_len);
-}
-
-PRInt32 Base64Decode_int(const char *in_str, unsigned char *out_str,
-                                PRUint32& decoded_len)
-{
-    PRInt32 in_len = strlen (/*(char *)*/ in_str);
-    PRInt32 ii = 0;
-    PRInt32 a = 0;
-    char ch;
-    PRInt32 b1 = 0;
-    long b4 = 0;
-    PRInt32 nn = 0;
-
-    /* Decode remainder of base 64 string */
-
-    while (ii < in_len)
-    {
-        ch = in_str[ii++];
-        if (ch >= 'A' && ch <= 'Z') b1 = (ch - 'A');
-        else if (ch >= 'a' && ch <= 'z') b1 = 26 + (ch - 'a');
-        else if (ch >= '0' && ch <= '9') b1 = 52 + (ch - '0');
-        else if (ch == '+') b1 = 62;
-        else if (ch == '/') b1 = 63;
-        else if (ch == '\r' || ch == '\n') continue;
-        else
-        {
-            if (ch == '=')
-            {
-                if (nn == 3)
-                {
-                    if ((a + 2) > (PRInt32) decoded_len) 
-                        return (-1); /* Bail.  Buffer overflow */
-                    b4 = (b4 << 6);
-                    out_str[a++] = (char) (0xff & (b4 >> 16));
-                    out_str[a++] = (char) (0xff & (b4 >> 8));
-                }
-                else if (nn == 2)
-                {
-                    if ((a + 1) > (PRInt32) decoded_len)
-                    {
-                        return (-1); /* Bail.  Buffer overflow */
-                    }
-                    b4 = (b4 << 12);
-                    out_str[a++] = (char) (0xff & (b4 >> 16));
-                }
-            }
-            break;
-        }
-        b4 = (b4 << 6) | (long) b1;
-        nn++;
-        if (nn == 4)
-        {
-            if ((a + 3) > (PRInt32) decoded_len)
-            {
-                return (-1); /* Bail.  Buffer overflow */
-            }
-            out_str[a++] = (char) (0xff & (b4 >> 16));
-            out_str[a++] = (char) (0xff & (b4 >> 8));
-            out_str[a++] = (char) (0xff & (b4));
-            nn = 0;
-        }
-    }
-
-    out_str[a] = '\0';
-    decoded_len = a;
-
-    return (a);
-}
-
-NS_IMETHODIMP nsAbSyncPostEngine::GetInterface(const nsIID & aIID, void * *aInstancePtr)
-{
-   NS_ENSURE_ARG_POINTER(aInstancePtr);
-   return QueryInterface(aIID, aInstancePtr);
-}
-
-// nsIURIContentListener support
-NS_IMETHODIMP 
-nsAbSyncPostEngine::OnStartURIOpen(nsIURI* aURI, 
-   const char* aWindowTarget, PRBool* aAbortOpen)
-{
-   return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::GetProtocolHandler(nsIURI *aURI, nsIProtocolHandler **aProtocolHandler)
-{
-  *aProtocolHandler = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::IsPreferred(const char * aContentType,
-                                nsURILoadCommand aCommand,
-                                const char * aWindowTarget,
-                                char ** aDesiredContentType,
-                                PRBool * aCanHandleContent)
-
-{
-  return CanHandleContent(aContentType, aCommand, aWindowTarget, aDesiredContentType,
-                          aCanHandleContent);
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::CanHandleContent(const char * aContentType,
-                                nsURILoadCommand aCommand,
-                                const char * aWindowTarget,
-                                char ** aDesiredContentType,
-                                PRBool * aCanHandleContent)
-
-{
-  if (nsCRT::strcasecmp(aContentType, MESSAGE_RFC822) == 0)
-    *aDesiredContentType = nsCRT::strdup("text/html");
-
-  // since we explicilty loaded the url, we always want to handle it!
-  *aCanHandleContent = PR_TRUE;
-  return NS_OK;
-} 
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::DoContent(const char * aContentType,
-                      nsURILoadCommand aCommand,
-                      const char * aWindowTarget,
-                      nsIRequest *request,
-                      nsIStreamListener ** aContentHandler,
-                      PRBool * aAbortProcess)
-{
-  nsresult rv = NS_OK;
-  if (aAbortProcess)
-    *aAbortProcess = PR_FALSE;
-  QueryInterface(NS_GET_IID(nsIStreamListener), (void **) aContentHandler);
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::GetParentContentListener(nsIURIContentListener** aParent)
-{
-  *aParent = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::SetParentContentListener(nsIURIContentListener* aParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::GetLoadCookie(nsISupports ** aLoadCookie)
-{
-  *aLoadCookie = mLoadCookie;
-  NS_IF_ADDREF(*aLoadCookie);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::SetLoadCookie(nsISupports * aLoadCookie)
-{
-  mLoadCookie = aLoadCookie;
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::StillRunning(PRBool *running)
-{
-  *running = mStillRunning;
-  return NS_OK;
-}
-
-
-// Methods for nsIStreamListener...
-nsresult
-nsAbSyncPostEngine::OnDataAvailable(nsIRequest *request, nsISupports * ctxt, nsIInputStream *aIStream, 
-                                    PRUint32 sourceOffset, PRUint32 aLength)
-{
-  PRUint32        readLen = aLength;
-
-  char *buf = (char *)PR_Malloc(aLength);
-  if (!buf)
-    return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
-
-  // read the data from the input stram...
-  nsresult rv = aIStream->Read(buf, aLength, &readLen);
-  if (NS_FAILED(rv)) return rv;
-
-  // write to the protocol response buffer...
-  mProtocolResponse.Append(NS_ConvertASCIItoUCS2(buf, readLen));
-  PR_FREEIF(buf);
-  mTotalWritten += readLen;
-
-  if (!mAuthenticationRunning)
-    NotifyListenersOnProgress(mTransactionID, mTotalWritten, 0);
-  return NS_OK;
-}
-
-
-// Methods for nsIRequestObserver 
-nsresult
-nsAbSyncPostEngine::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
-{
-  if (mAuthenticationRunning)
-    NotifyListenersOnStartAuthOperation();
-  else
-    NotifyListenersOnStartSending(mTransactionID, mMessageSize);
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult aStatus)
-{
-#ifdef NS_DEBUG_rhp
-  printf("nsAbSyncPostEngine::OnStopRequest()\n");
-#endif
-
-  char  *tProtResponse = nsnull;
-
-  //
-  // Now complete the stream!
-  //
-  mStillRunning = PR_FALSE;
-
-  // Check the content type!
-  nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
-  if (channel)
-  {
-    char    *contentType = nsnull;
-    char    *charset = nsnull;
-
-    if (NS_SUCCEEDED(channel->GetContentType(&contentType)) && contentType)
-    {
-      if (PL_strcasecmp(contentType, UNKNOWN_CONTENT_TYPE))
-      {
-        mContentType = contentType;
-      }
-    }
-    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
-    if (httpChannel)
-    {
-      if (NS_SUCCEEDED(httpChannel->GetCharset(&charset)) && charset)
-      {
-        mCharset = charset;
-      }
-    }
-  }  
-
-  // set the state...
-  mPostEngineState = nsIAbSyncPostEngineState::nsIAbSyncPostIdle;
-
-  if (mAuthenticationRunning)
-  {
-    nsresult  rv;
-    if (mSyncMojo)
-      rv = mSyncMojo->GetAbSyncMojoResults(&mUser, &mCookie, &mMojoSyncSpec, &mMojoSyncPort);
-
-    if (NS_SUCCEEDED(rv))
-    {
-      // Before we really get started...lets let sync know who is doing this...
-	    NS_WITH_SERVICE(nsIAbSync, sync, kAbSync, &rv); 
-	    if (NS_SUCCEEDED(rv) || sync) 
-        sync->SetAbSyncUser(mUser);
-
-      // Base64 encode then url encode it...
-      //
-      char    tUser[256] = "";
-
-      if (Base64Encode((unsigned char *)mUser, nsCRT::strlen(mUser), tUser, sizeof(tUser)) < 0)
-      {
-        rv = NS_ERROR_FAILURE;
-        NotifyListenersOnStopAuthOperation(rv, tProtResponse);
-        NotifyListenersOnStopSending(mTransactionID, rv, nsnull);
-      }
-      else 
-      {
-        char *tUser2 = nsEscape(tUser, url_Path);
-        if (!tUser2)
-        {
-          rv = NS_ERROR_FAILURE;
-          NotifyListenersOnStopAuthOperation(rv, tProtResponse);
-          NotifyListenersOnStopSending(mTransactionID, rv, nsnull);
-        }
-        else
-        {
-          mSyncProtocolRequestPrefix = PR_smprintf("cn=%s&cc=%s&", tUser2, mCookie);
-          PR_FREEIF(tUser2);
-          NotifyListenersOnStopAuthOperation(aStatus, tProtResponse);
-          KickTheSyncOperation();
-        }
-      }
-
-      // RICHIE - Special here to show the server we are hitting!
-      // RICHIE - REMOVE THIS BEFORE SHIPPING!!!!
-#ifdef DEBUG
-      PRUnichar *msgValue = nsnull;
-      msgValue = nsTextFormatter::smprintf(nsString(NS_ConvertASCIItoUCS2("Server: %s - port %d")).GetUnicode(),
-                                           mMojoSyncSpec, mMojoSyncPort);
-      NotifyListenersOnStatus(mTransactionID, msgValue);
-      PR_FREEIF(msgValue);
-      // RICHIE 
-#endif
-    }
-    else
-    {
-      NotifyListenersOnStopAuthOperation(rv, tProtResponse);
-      NotifyListenersOnStopSending(mTransactionID, rv, nsnull);
-    }
-
-    mSyncMojo = nsnull;
-  }
-  else
-  {
-    tProtResponse = mProtocolResponse.ToNewCString();
-    NotifyListenersOnStopSending(mTransactionID, aStatus, tProtResponse);
-  }
-
-  PR_FREEIF(tProtResponse);
-
-  // Time to return...
-  return NS_OK;
-}
-
-/* void AddSyncListener (in nsIAbSyncPostListener aListener); */
-NS_IMETHODIMP nsAbSyncPostEngine::AddPostListener(nsIAbSyncPostListener *aListener)
-{
-  if ( (mListenerArrayCount > 0) || mListenerArray )
-  {
-    ++mListenerArrayCount;
-    mListenerArray = (nsIAbSyncPostListener **) 
-                  PR_Realloc(*mListenerArray, sizeof(nsIAbSyncPostListener *) * mListenerArrayCount);
-    if (!mListenerArray)
-      return NS_ERROR_OUT_OF_MEMORY;
-    else
-    {
-      mListenerArray[mListenerArrayCount - 1] = aListener;
-      return NS_OK;
-    }
-  }
-  else
-  {
-    mListenerArrayCount = 1;
-    mListenerArray = (nsIAbSyncPostListener **) PR_Malloc(sizeof(nsIAbSyncPostListener *) * mListenerArrayCount);
-    if (!mListenerArray)
-      return NS_ERROR_OUT_OF_MEMORY;
-
-    nsCRT::memset(mListenerArray, 0, (sizeof(nsIAbSyncPostListener *) * mListenerArrayCount));
-  
-    mListenerArray[0] = aListener;
-    NS_ADDREF(mListenerArray[0]);
-    return NS_OK;
-  }
-}
-
-/* void RemoveSyncListener (in nsIAbSyncPostListener aListener); */
-NS_IMETHODIMP nsAbSyncPostEngine::RemovePostListener(nsIAbSyncPostListener *aListener)
-{
-  PRInt32 i;
-  for (i=0; i<mListenerArrayCount; i++)
-    if (mListenerArray[i] == aListener)
-    {
-      NS_RELEASE(mListenerArray[i]);
-      mListenerArray[i] = nsnull;
-      return NS_OK;
-    }
-
-  return NS_ERROR_INVALID_ARG;
-}
-
-nsresult
-nsAbSyncPostEngine::DeleteListeners()
-{
-  if ( (mListenerArray) && (*mListenerArray) )
-  {
-    PRInt32 i;
-    for (i=0; i<mListenerArrayCount; i++)
-    {
-      NS_RELEASE(mListenerArray[i]);
-    }
-    
-    PR_FREEIF(mListenerArray);
-  }
-
-  mListenerArrayCount = 0;
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::NotifyListenersOnStartAuthOperation(void)
-{
-  PRInt32 i;
-  for (i=0; i<mListenerArrayCount; i++)
-    if (mListenerArray[i] != nsnull)
-      mListenerArray[i]->OnStartAuthOperation();
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::NotifyListenersOnStopAuthOperation(nsresult aStatus, const char *aCookie)
-{
-  PRInt32 i;
-  for (i=0; i<mListenerArrayCount; i++)
-    if (mListenerArray[i] != nsnull)
-      mListenerArray[i]->OnStopAuthOperation(aStatus, nsnull, aCookie);
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::NotifyListenersOnStartSending(PRInt32 aTransactionID, PRUint32 aMsgSize)
-{
-  PRInt32 i;
-  for (i=0; i<mListenerArrayCount; i++)
-    if (mListenerArray[i] != nsnull)
-      mListenerArray[i]->OnStartOperation(aTransactionID, aMsgSize);
-
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::NotifyListenersOnProgress(PRInt32 aTransactionID, PRUint32 aProgress, PRUint32 aProgressMax)
-{
-  PRInt32 i;
-  for (i=0; i<mListenerArrayCount; i++)
-    if (mListenerArray[i] != nsnull)
-      mListenerArray[i]->OnProgress(aTransactionID, aProgress, aProgressMax);
-
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::NotifyListenersOnStatus(PRInt32 aTransactionID, PRUnichar *aMsg)
-{
-  PRInt32 i;
-  for (i=0; i<mListenerArrayCount; i++)
-    if (mListenerArray[i] != nsnull)
-      mListenerArray[i]->OnStatus(aTransactionID, aMsg);
-
-  return NS_OK;
-}
-
-nsresult
-nsAbSyncPostEngine::NotifyListenersOnStopSending(PRInt32 aTransactionID, nsresult aStatus, 
-                                                 char *aProtocolResponse)
-{
-  PRInt32 i;
-  for (i=0; i<mListenerArrayCount; i++)
-    if (mListenerArray[i] != nsnull)
-      mListenerArray[i]->OnStopOperation(aTransactionID, aStatus, nsnull, aProtocolResponse);
-
-  return NS_OK;
-}
-
-// Utility to create a nsIURI object...
-extern "C" nsresult 
-nsEngineNewURI(nsIURI** aInstancePtrResult, const char *aSpec, nsIURI *aBase)
-{  
-  nsresult  res;
-
-  if (nsnull == aInstancePtrResult) 
-    return NS_ERROR_NULL_POINTER;
-  
-  NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &res);
-  if (NS_FAILED(res)) 
-    return NS_ERROR_FACTORY_NOT_REGISTERED;
-
-  return pService->NewURI(aSpec, aBase, aInstancePtrResult);
-}
-
-nsresult
-nsAbSyncPostEngine::FireURLRequest(nsIURI *aURL, const char *postData)
-{
-  nsresult rv;
-  nsCOMPtr<nsIInputStream> postStream;
-
-  if (!postData)
-    return NS_ERROR_INVALID_ARG;
-
-  NS_ENSURE_SUCCESS(NS_OpenURI(getter_AddRefs(mChannel), aURL, nsnull), NS_ERROR_FAILURE);
-
-  // Tag the post stream onto the channel...but never seemed to work...so putting it
-  // directly on the URL spec
-  //
-  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel);
-  if (!httpChannel)
-    return NS_ERROR_FAILURE;
-
-  if (NS_SUCCEEDED(rv = NS_NewPostDataStream(getter_AddRefs(postStream), PR_FALSE, postData, 0)))
-    httpChannel->SetUploadStream(postStream);
-  
-  httpChannel->AsyncOpen(this, nsnull);
-
-  return NS_OK;
-}
-
-/* PRInt32 GetCurrentState (); */
-NS_IMETHODIMP nsAbSyncPostEngine::GetCurrentState(PRInt32 *_retval)
-{
-  *_retval = mPostEngineState;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-//
-// This is the implementation of the actual post driver. 
-//
-////////////////////////////////////////////////////////////////////////////////////////
-NS_IMETHODIMP nsAbSyncPostEngine::BuildMojoString(nsIDocShell *aRootDocShell, char **aID)
-{
-  nsresult        rv;
-
-  if (!aID)
-    return NS_ERROR_FAILURE;
-
-  // Now, get the COMPtr to the Mojo!
-  if (!mSyncMojo)
-  {
-    rv = nsComponentManager::CreateInstance(kCAbSyncMojoCID, NULL, NS_GET_IID(nsIAbSyncMojo), getter_AddRefs(mSyncMojo));
-    if ( NS_FAILED(rv) || (!mSyncMojo) )
-      return NS_ERROR_FAILURE;
-  }
-
-  rv = mSyncMojo->BuildMojoString(aRootDocShell, aID);
-  return rv;
-}
-
-NS_IMETHODIMP nsAbSyncPostEngine::SendAbRequest(const char *aSpec, PRInt32 aPort, const char *aProtocolRequest, PRInt32 aTransactionID,
-                                                nsIDocShell *aDocShell, const char *aUser)
-{
-  nsresult      rv;
-  char          *mojoUser = nsnull;
-  char          *mojoSnack = nsnull;
-
-  // Only try if we are not currently busy!
-  if (mPostEngineState != nsIAbSyncPostEngineState::nsIAbSyncPostIdle)
-    return NS_ERROR_FAILURE;
-
-  // Now, get the COMPtr to the Mojo!
-  if (!mSyncMojo)
-  {
-    rv = nsComponentManager::CreateInstance(kCAbSyncMojoCID, NULL, NS_GET_IID(nsIAbSyncMojo), getter_AddRefs(mSyncMojo));
-    if ( NS_FAILED(rv) || (!mSyncMojo) )
-      return NS_ERROR_FAILURE;
-  }
-
-  if (aUser)
-    mUser = nsCRT::strdup(aUser);
-  if (NS_FAILED(mSyncMojo->StartAbSyncMojo(this, aDocShell, mUser)))
-    return NS_ERROR_FAILURE;  
-
-  // Set transaction ID and save/init Sync info...
-  mTransactionID = aTransactionID;
-
-  // Init stuff we need....
-  mSyncProtocolRequest = nsCRT::strdup(aProtocolRequest);
-  mProtocolResponse = NS_ConvertASCIItoUCS2("");
-  mTotalWritten = 0;
-
-  // The first thing we need to do is authentication so do it!
-  mAuthenticationRunning = PR_TRUE;
-  mPostEngineState = nsIAbSyncPostEngineState::nsIAbSyncAuthenticationRunning;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::KickTheSyncOperation(void)
-{
-  nsresult  rv;
-  nsIURI    *workURI = nsnull;
-  char      *protString = nsnull;
-
-  // The first thing we need to do is authentication so do it!
-  mAuthenticationRunning = PR_FALSE;
-  mProtocolResponse = NS_ConvertASCIItoUCS2("");
-  mPostEngineState = nsIAbSyncPostEngineState::nsIAbSyncPostRunning;
-
-  char    *postHeader = "Content-Type: application/x-www-form-urlencoded\r\nContent-Length: %d\r\nCookie: %s\r\n\r\n%s";
-  protString = PR_smprintf("%s%s", mSyncProtocolRequestPrefix, mSyncProtocolRequest);
-  if (protString)
-    mMessageSize = nsCRT::strlen(protString);
-  else
-    mMessageSize = 0;
-
-  char *tCommand = PR_smprintf(postHeader, mMessageSize, mCookie, protString);
-  PR_FREEIF(protString);
-
-#ifdef DEBUG_rhp
-  printf("COMMAND = %s\n", tCommand);
-#endif
-
-  if (!tCommand)
-  {
-    rv = NS_ERROR_OUT_OF_MEMORY; // we couldn't allocate the string 
-    goto GetOuttaHere;
-  }
-
-  rv = nsEngineNewURI(&workURI, mMojoSyncSpec, nsnull);
-  if (NS_FAILED(rv) || (!workURI))
-  {
-    rv = NS_ERROR_FAILURE;  // we couldn't allocate the string 
-    goto GetOuttaHere;
-  }
-
-  if (mMojoSyncPort > 0)
-    workURI->SetPort(mMojoSyncPort);
-
-  rv = FireURLRequest(workURI, tCommand);
-
-  if (NS_SUCCEEDED(rv))
-    NotifyListenersOnStartSending(mTransactionID, mMessageSize);
-
-GetOuttaHere:
-  NS_IF_RELEASE(workURI);
-  PR_FREEIF(tCommand);
-  mPostEngineState = nsIAbSyncPostEngineState::nsIAbSyncPostRunning;
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::CancelAbSync()
-{
-  nsresult      rv = NS_ERROR_FAILURE;
-
-  if (mSyncMojo)
-  {
-    rv = mSyncMojo->CancelTheMojo();
-  }
-  else if (mChannel)
-  {
-    rv = mChannel->Cancel(NS_BINDING_ABORTED);
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsAbSyncPostEngine::GetMojoUserAndSnack(char **aMojoUser, char **aMojoSnack)
-{
-  if ( (!mUser) || (!mCookie) )
-    return NS_ERROR_FAILURE;
-
-  *aMojoUser = nsCRT::strdup(mUser);
-  *aMojoSnack = nsCRT::strdup(mCookie);
-
-  if ( (!*aMojoUser) || (!*aMojoSnack) )
-    return NS_ERROR_FAILURE;
-  else
-    return NS_OK;
-}

mozilla/mailnews/compose/src/nsURLFetcher.cpp

@@ -1,453 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-#include "nsURLFetcher.h"
-
-#include "msgCore.h" // for pre-compiled headers
-#include "nsCOMPtr.h"
-#include <stdio.h>
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "comi18n.h"
-#include "prmem.h"
-#include "plstr.h"
-#include "nsRepository.h"
-#include "nsString.h"
-#include "nsIIOService.h"
-#include "nsIChannel.h"
-#include "nsNetUtil.h"
-#include "nsMimeTypes.h"
-#include "nsIHttpChannel.h"
-#include "nsIWebProgress.h"
-#include "nsMsgAttachmentHandler.h"
-#include "nsMsgSend.h"
-
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-
-
-NS_IMPL_ISUPPORTS7(nsURLFetcher, nsIURLFetcher, nsIStreamListener, nsIURIContentListener, nsIInterfaceRequestor, nsIWebProgressListener, nsIHttpEventSink, nsISupportsWeakReference)
-
-
-/* 
- * Inherited methods for nsMimeConverter
- */
-nsURLFetcher::nsURLFetcher()
-{
-#if defined(DEBUG_ducarroz)
-  printf("CREATE nsURLFetcher: %x\n", this);
-#endif
-  /* the following macro is used to initialize the ref counting data */
-  NS_INIT_REFCNT();
-
-  // Init member variables...
-  mOutStream = nsnull;
-  mTotalWritten = 0;
-  mStillRunning = PR_TRUE;
-  mCallback = nsnull;
-  mContentType = nsnull;
-  mCharset = nsnull;
-  mOnStopRequestProcessed = PR_FALSE;
-  mRedirection = PR_FALSE;
-}
-
-nsURLFetcher::~nsURLFetcher()
-{
-#if defined(DEBUG_ducarroz)
-  printf("DISPOSE nsURLFetcher: %x\n", this);
-#endif
-  mStillRunning = PR_FALSE;
-  
-  PR_FREEIF(mContentType);
-  PR_FREEIF(mCharset);
-  // Remove the DocShell as a listener of the old WebProgress...
-  if (mLoadCookie) 
-  {
-    nsCOMPtr<nsIWebProgress> webProgress(do_QueryInterface(mLoadCookie));
-
-    if (webProgress)
-      webProgress->RemoveProgressListener(this);
-  }
-}
-
-NS_IMETHODIMP nsURLFetcher::GetInterface(const nsIID & aIID, void * *aInstancePtr)
-{
-   NS_ENSURE_ARG_POINTER(aInstancePtr);
-   return QueryInterface(aIID, aInstancePtr);
-}
-
-// nsIURIContentListener support
-NS_IMETHODIMP 
-nsURLFetcher::OnStartURIOpen(nsIURI* aURI, 
-   const char* aWindowTarget, PRBool* aAbortOpen)
-{
-   return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::GetProtocolHandler(nsIURI *aURI, nsIProtocolHandler **aProtocolHandler)
-{
-  *aProtocolHandler = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::IsPreferred(const char * aContentType,
-                                nsURILoadCommand aCommand,
-                                const char * aWindowTarget,
-                                char ** aDesiredContentType,
-                                PRBool * aCanHandleContent)
-
-{
-  return CanHandleContent(aContentType, aCommand, aWindowTarget, aDesiredContentType,
-                          aCanHandleContent);
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::CanHandleContent(const char * aContentType,
-                                nsURILoadCommand aCommand,
-                                const char * aWindowTarget,
-                                char ** aDesiredContentType,
-                                PRBool * aCanHandleContent)
-
-{
-  if (nsCRT::strcasecmp(aContentType, MESSAGE_RFC822) == 0)
-    *aDesiredContentType = nsCRT::strdup("text/html");
-
-  // since we explicilty loaded the url, we always want to handle it!
-  *aCanHandleContent = PR_TRUE;
-  return NS_OK;
-} 
-
-NS_IMETHODIMP 
-nsURLFetcher::DoContent(const char * aContentType,
-                      nsURILoadCommand aCommand,
-                      const char * aWindowTarget,
-                      nsIRequest *request,
-                      nsIStreamListener ** aContentHandler,
-                      PRBool * aAbortProcess)
-{
-  nsresult rv = NS_OK;
-  if (aAbortProcess)
-    *aAbortProcess = PR_FALSE;
-  QueryInterface(NS_GET_IID(nsIStreamListener), (void **) aContentHandler);
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::GetParentContentListener(nsIURIContentListener** aParent)
-{
-  *aParent = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::SetParentContentListener(nsIURIContentListener* aParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::GetLoadCookie(nsISupports ** aLoadCookie)
-{
-  *aLoadCookie = mLoadCookie;
-  NS_IF_ADDREF(*aLoadCookie);
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::SetLoadCookie(nsISupports * aLoadCookie)
-{
-  // Remove the DocShell as a listener of the old WebProgress...
-  if (mLoadCookie) 
-  {
-    nsCOMPtr<nsIWebProgress> webProgress(do_QueryInterface(mLoadCookie));
-
-    if (webProgress)
-      webProgress->RemoveProgressListener(this);
-  }
-
-  mLoadCookie = aLoadCookie;
-
-  // Add the DocShell as a listener to the new WebProgress...
-  if (mLoadCookie) 
-  {
-    nsCOMPtr<nsIWebProgress> webProgress(do_QueryInterface(mLoadCookie));
-
-    if (webProgress) 
-      webProgress->AddProgressListener(this);
-  }
-  return NS_OK;
-
-}
-
-nsresult
-nsURLFetcher::StillRunning(PRBool *running)
-{
-  *running = mStillRunning;
-  return NS_OK;
-}
-
-
-// Methods for nsIStreamListener...
-nsresult
-nsURLFetcher::OnDataAvailable(nsIRequest *request, nsISupports * ctxt, nsIInputStream *aIStream, 
-                              PRUint32 sourceOffset, PRUint32 aLength)
-{
-  PRUint32        readLen = aLength;
-  PRUint32        wroteIt;
-
-  if (!mOutStream)
-    return NS_ERROR_INVALID_ARG;
-
-  char *buf = (char *)PR_Malloc(aLength);
-  if (!buf)
-    return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
-
-  // read the data from the input stram...
-  nsresult rv = aIStream->Read(buf, aLength, &readLen);
-  if (NS_FAILED(rv)) return rv;
-
-  // write to the output file...
-  wroteIt = mOutStream->write(buf, readLen);
-  PR_FREEIF(buf);
-
-  if (wroteIt != readLen)
-    return NS_ERROR_FAILURE;
-  else
-  {
-    mTotalWritten += wroteIt;
-    return NS_OK;
-  }
-}
-
-
-// Methods for nsIStreamObserver 
-nsresult
-nsURLFetcher::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
-{
-  mRedirection = PR_FALSE;  // start a new request, reset mRedirection
-  
-  nsMsgAttachmentHandler *attachmentHdl = (nsMsgAttachmentHandler *)mTagData;
-  if (attachmentHdl)
-  {
-    nsCOMPtr<nsIMsgSend> sendPtr;
-    attachmentHdl->GetMimeDeliveryState(getter_AddRefs(sendPtr));
-    if (sendPtr)
-    {
-      nsCOMPtr<nsIMsgProgress> progress;
-      sendPtr->GetProgress(getter_AddRefs(progress));
-      if (progress)
-      {
-        PRBool cancel = PR_FALSE;
-        progress->GetProcessCanceledByUser(&cancel);
-        if (cancel)
-          return request->Cancel(NS_ERROR_ABORT);
-      }
-    }
-    attachmentHdl->mRequest = request;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsURLFetcher::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, nsresult aStatus)
-{
-#if defined(DEBUG_ducarroz)
-  printf("nsURLFetcher::OnStopRequest()\n");
-#endif
-
-  // it's possible we could get in here from the channel calling us with an OnStopRequest and from our
-  // onStatusChange method (in the case of an error). So we should protect against this to make sure we
-  // don't process the on stop request twice...
-
-  if (mOnStopRequestProcessed) return NS_OK;
-  mOnStopRequestProcessed = PR_TRUE;
-  
-  nsMsgAttachmentHandler *attachmentHdl = (nsMsgAttachmentHandler *)mTagData;
-  if (attachmentHdl)
-    attachmentHdl->mRequest = nsnull;
-
-  //
-  // Now complete the stream!
-  //
-  mStillRunning = PR_FALSE;
-
-  // First close the output stream...
-  if (mOutStream)
-  {
-    mOutStream->close();
-    mOutStream = nsnull;
-  }
-
-  
-  // Check the content type!
-  char    *contentType = nsnull;
-  char    *charset = nsnull;
-
-  nsCOMPtr<nsIChannel> aChannel = do_QueryInterface(request);
-  if(!aChannel) return NS_ERROR_FAILURE;
-
-  if (NS_SUCCEEDED(aChannel->GetContentType(&contentType)) && contentType)
-  {
-    if (PL_strcasecmp(contentType, UNKNOWN_CONTENT_TYPE))
-    {
-      mContentType = contentType;
-    }
-  }
-
-  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aChannel);
-  if (httpChannel)
-  {
-    if (NS_SUCCEEDED(httpChannel->GetCharset(&charset)) && charset)
-    {
-      mCharset = charset;
-    }
-  }
-
-  // Now if there is a callback, we need to call it...
-  if (mCallback)
-    mCallback (aStatus, mContentType, mCharset, mTotalWritten, nsnull, mTagData);
-
-  // Time to return...
-  return NS_OK;
-}
-
-nsresult 
-nsURLFetcher::Initialize(nsOutputFileStream *fOut,
-                         nsAttachSaveCompletionCallback cb, 
-                         void *tagData)
-{
-  if (!fOut)
-    return NS_ERROR_INVALID_ARG;
-
-  if (!fOut->is_open())
-    return NS_ERROR_FAILURE;
-
-  mOutStream = fOut;
-  mCallback = cb;     //JFD: Please, no more callback, use a listener...
-  mTagData = tagData; //JFD: TODO, WE SHOULD USE A NSCOMPTR to hold this stuff!!!
-  return NS_OK;
-}
-
-nsresult
-nsURLFetcher::FireURLRequest(nsIURI *aURL, nsOutputFileStream *fOut, 
-                             nsAttachSaveCompletionCallback cb, void *tagData)
-{
-  nsresult rv;
-
-  if ( (!aURL) || (!fOut) )
-  {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  if (!fOut->is_open())
-  {
-    return NS_ERROR_FAILURE;
-  }
-
-  // we're about to fire a new url request so make sure the on stop request flag is cleared...
-  mOnStopRequestProcessed = PR_FALSE;
-
-  // let's try uri dispatching...
-  nsCOMPtr<nsIURILoader> pURILoader (do_GetService(NS_URI_LOADER_CONTRACTID));
-  NS_ENSURE_TRUE(pURILoader, NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsISupports> cntListener (do_QueryInterface(NS_STATIC_CAST(nsIStreamListener *, this)));
-  nsCOMPtr<nsIChannel> channel;
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  pURILoader->GetLoadGroupForContext(cntListener, getter_AddRefs(loadGroup));
-  NS_ENSURE_SUCCESS(NS_OpenURI(getter_AddRefs(channel), aURL, nsnull, loadGroup, this), NS_ERROR_FAILURE);
- 
-  rv = pURILoader->OpenURI(channel, nsIURILoader::viewNormal, nsnull /* window target */, 
-                           cntListener);
-
-  mOutStream = fOut;
-  mCallback = cb;
-  mTagData = tagData;
-
-  return NS_OK;
-}
-
-
-// web progress listener implementation
-
-NS_IMETHODIMP
-nsURLFetcher::OnProgressChange(nsIWebProgress *aProgress, nsIRequest *aRequest,
-                             PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress,
-                             PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsURLFetcher::OnStateChange(nsIWebProgress *aProgress, nsIRequest *aRequest,
-                          PRInt32 aStateFlags, nsresult aStatus)
-{
-  // all we care about is the case where an error occurred (as in we were unable to locate the
-  // the url....
-
-  if (NS_FAILED(aStatus))
-  {
-    //... but we must ignore abort message caused by a redirection!
-    if (aStatus == NS_BINDING_ABORTED && mRedirection)
-        return NS_OK;
-
-    OnStopRequest(aRequest, nsnull, aStatus);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsURLFetcher::OnLocationChange(nsIWebProgress* aWebProgress,
-                               nsIRequest* aRequest,
-                               nsIURI *aURI)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::OnStatusChange(nsIWebProgress* aWebProgress,
-                             nsIRequest* aRequest,
-                             nsresult aStatus,
-                             const PRUnichar* aMessage)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsURLFetcher::OnSecurityChange(nsIWebProgress *aWebProgress, 
-                               nsIRequest *aRequest, 
-                               PRInt32 state)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsURLFetcher::OnRedirect(nsIHttpChannel *aOldChannel, nsIChannel *aNewChannel)
-{
-  mRedirection = PR_TRUE;
-  return NS_OK;
-}

mozilla/mailnews/compose/src/nsURLFetcher.h

@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- */
-#ifndef nsURLFetcher_h_
-#define nsURLFetcher_h_
-
-#include "nsIURLFetcher.h"
-
-#include "nsCOMPtr.h"
-#include "nsIInputStream.h"
-#include "nsIStreamListener.h"
-
-#include "nsIInterfaceRequestor.h"
-#include "nsCURILoader.h"
-#include "nsIURIContentListener.h"
-#include "nsIWebProgressListener.h"
-#include "nsIHttpEventSink.h"
-#include "nsWeakReference.h"
-
-
-class nsURLFetcher : public nsIURLFetcher,
-                     public nsIStreamListener,
-                     public nsIURIContentListener, 
-                     public nsIInterfaceRequestor,
-                     public nsIWebProgressListener,
-                     public nsIHttpEventSink,
-                     public nsSupportsWeakReference
-{ 
-public: 
-  nsURLFetcher();
-  virtual ~nsURLFetcher();
-
-  /* this macro defines QueryInterface, AddRef and Release for this class */
-  NS_DECL_ISUPPORTS
-
-  // Methods for nsIURLFetcher
-  NS_DECL_NSIURLFETCHER
-
-  // Methods for nsIStreamListener
-  NS_DECL_NSISTREAMLISTENER
-
-  // Methods for nsIRequestObserver
-  NS_DECL_NSIREQUESTOBSERVER
-  
-  // Methods for nsIURICOntentListener
-  NS_DECL_NSIURICONTENTLISTENER
-
-  // Methods for nsIInterfaceRequestor
-  NS_DECL_NSIINTERFACEREQUESTOR
-
-  // Methods for nsIWebProgressListener
-  NS_DECL_NSIWEBPROGRESSLISTENER
-
-  // Methods for nsIHttpEventSink
-  NS_DECL_NSIHTTPEVENTSINK
-
-private:
-  nsOutputFileStream              *mOutStream;    // the output file stream
-  PRBool                          mStillRunning;  // Are we still running?
-  PRInt32                         mTotalWritten;  // Size counter variable
-  char                            *mContentType;  // The content type retrieved from the server
-  char                            *mCharset;      // The charset retrieved from the server
-  void                            *mTagData;      // Tag data for callback...
-  nsAttachSaveCompletionCallback  mCallback;      // Callback to call once the file is saved...
-  nsCOMPtr<nsISupports>           mLoadCookie;    // load cookie used by the uri loader when we fetch the url
-  PRBool                          mOnStopRequestProcessed; // used to prevent calling OnStopRequest multiple times
-  PRBool                          mRedirection;   // Set when we get a redirection, should ignore stop message.
-}; 
-
-#endif /* nsURLFetcher_h_ */

mozilla/modules/libjar/nsIJARChannel.idl

@@ -1,39 +0,0 @@
-/* -*- Mode: IDL; 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): 
- */
-
-#include "nsIChannel.idl"
-
-interface nsISimpleEnumerator;
-
-[scriptable, uuid(c7e410d1-85f2-11d3-9f63-006008a6efe9)]
-interface nsIJARChannel : nsIChannel 
-{
-
-    /**
-     * Enumerates all the entries in the JAR (the root URI).
-     * ARGUMENTS:
-     *  aRoot - a string representing the root dir to enumerate from
-     *    or null to enumerate the whole thing.
-     */
-    nsISimpleEnumerator EnumerateEntries(in string aRoot);
-
-};

mozilla/modules/libjar/nsIJARProtocolHandler.idl

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; 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): 
- */
-
-#include "nsIProtocolHandler.idl"
-
-interface nsIZipReaderCache;
-
-[scriptable, uuid(92c3b42c-98c4-11d3-8cd9-0060b0fc14a3)]
-interface nsIJARProtocolHandler : nsIProtocolHandler {
-
-    /**
-     * JARCache contains the collection of open jar files.
-     */
-    readonly attribute nsIZipReaderCache JARCache;
-};

mozilla/modules/libjar/nsIJARURI.idl

@@ -1,42 +0,0 @@
-/* -*- Mode: IDL; 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIURI.idl"
-
-/**
- * JAR URLs have the following syntax
- *
- * jar:<jar-file-uri>!/<jar-entry>
- *
- * EXAMPLE: jar:http://www.big.com/blue.jar!/ocean.html
- */
-[scriptable, uuid(c7e410d3-85f2-11d3-9f63-006008a6efe9)]
-interface nsIJARURI : nsIURI {
-
-    /**
-     * Returns the root URI (the one for the actual JAR file) for this JAR.
-     * eg http://www.big.com/blue.jar
-     */
-    attribute nsIURI JARFile;
-
-    /**
-     * Returns the entry specified for this JAR URI.
-     * eg ocean.html
-     */
-	attribute string JAREntry;
-};

mozilla/modules/libjar/nsJARChannel.cpp

@@ -1,696 +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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998,2000 Netscape Communications Corporation. All Rights
- * Reserved.
- *
- */
-
-#include "nsNetUtil.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsJARChannel.h"
-#include "nsCRT.h"
-#include "nsIFileTransportService.h"
-#include "nsIURI.h"
-#include "nsCExternalHandlerService.h"
-#include "nsIMIMEService.h"
-#include "nsAutoLock.h"
-#include "nsIFileStreams.h"
-#include "nsMimeTypes.h"
-#include "nsScriptSecurityManager.h"
-#include "nsIAggregatePrincipal.h"
-#include "nsIProgressEventSink.h"
-#include "nsXPIDLString.h"
-#include "nsIJAR.h"
-
-static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
-static NS_DEFINE_CID(kScriptSecurityManagerCID, NS_SCRIPTSECURITYMANAGER_CID);
-
-#if defined(PR_LOGGING)
-//
-// Log module for SocketTransport logging...
-//
-// To enable logging (see prlog.h for full details):
-//
-//    set NSPR_LOG_MODULES=nsJarProtocol:5
-//    set NSPR_LOG_FILE=nspr.log
-//
-// this enables PR_LOG_DEBUG level information and places all output in
-// the file nspr.log
-//
-PRLogModuleInfo* gJarProtocolLog = nsnull;
-
-#endif /* PR_LOGGING */
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_DEFAULT_JAR_BUFFER_SEGMENT_SIZE      (16*1024)
-#define NS_DEFAULT_JAR_BUFFER_MAX_SIZE          (256*1024)
-
-nsJARChannel::nsJARChannel()
-    : mLoadFlags(LOAD_NORMAL),
-      mContentType(nsnull),
-      mContentLength(-1),
-      mJAREntry(nsnull),
-      mStatus(NS_OK),
-      mMonitor(nsnull)
-{
-    NS_INIT_REFCNT();
-
-#if defined(PR_LOGGING)
-    //
-    // Initialize the global PRLogModule for socket transport logging
-    // if necessary...
-    //
-    if (nsnull == gJarProtocolLog) {
-        gJarProtocolLog = PR_NewLogModule("nsJarProtocol");
-    }
-#endif /* PR_LOGGING */
-}
-
-nsJARChannel::~nsJARChannel()
-{
-    if (mContentType)
-        nsCRT::free(mContentType);
-    if (mJAREntry)
-        nsCRT::free(mJAREntry);
-    if (mMonitor)
-        PR_DestroyMonitor(mMonitor);
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS7(nsJARChannel,
-                              nsIJARChannel,
-                              nsIChannel,
-                              nsIRequest,
-                              nsIRequestObserver,
-                              nsIStreamListener,
-                              nsIStreamIO,
-                              nsIDownloadObserver)
-
-NS_METHOD
-nsJARChannel::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-	nsresult rv;
-
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARChannel* jarChannel = new nsJARChannel();
-    if (jarChannel == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(jarChannel);
-	rv = jarChannel->QueryInterface(aIID, aResult);
-    NS_RELEASE(jarChannel);
-	return rv;
-}
- 
-nsresult 
-nsJARChannel::Init(nsIJARProtocolHandler* aHandler, nsIURI* uri)
-{
-    nsresult rv;
-	mURI = do_QueryInterface(uri, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    mMonitor = PR_NewMonitor();
-    if (mMonitor == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    mJARProtocolHandler = aHandler;
-	return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods
-
-NS_IMETHODIMP
-nsJARChannel::GetName(PRUnichar* *result)
-{
-    nsresult rv;
-    nsXPIDLCString urlStr;
-    rv = mURI->GetSpec(getter_Copies(urlStr));
-    if (NS_FAILED(rv)) return rv;
-    nsString name;
-    name.AppendWithConversion(urlStr);
-    *result = name.ToNewUnicode();
-    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARChannel::IsPending(PRBool* result)
-{
-	NS_NOTREACHED("nsJARChannel::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetStatus(nsresult *status)
-{
-    *status = mStatus;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Cancel(nsresult status)
-{
-    NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
-    nsresult rv = NS_OK;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Cancel(status);
-        mJarExtractionTransport = nsnull;
-    }
-
-    mStatus = status;
-	return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Suspend()
-{
-    nsresult rv = NS_OK;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Suspend();
-    }
-
-	return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Resume()
-{
-    nsresult rv = NS_OK;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Resume();
-    }
-
-	return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods
-
-NS_IMETHODIMP
-nsJARChannel::GetOriginalURI(nsIURI* *aOriginalURI)
-{
-    if (mOriginalURI)
-        *aOriginalURI = mOriginalURI;
-    else
-       *aOriginalURI = NS_STATIC_CAST(nsIURI*, mURI);
-
-    NS_IF_ADDREF(*aOriginalURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetOriginalURI(nsIURI* aOriginalURI)
-{
-    mOriginalURI = aOriginalURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetURI(nsIURI* *aURI)
-{
-    *aURI = mURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-nsresult
-nsJARChannel::OpenJARElement()
-{
-    nsresult rv;
-    nsAutoCMonitor mon(this);
-    rv = Open(nsnull, nsnull);
-    if (NS_SUCCEEDED(rv))
-        rv = GetInputStream(getter_AddRefs(mSynchronousInputStream));
-    mon.Notify();       // wake up nsIChannel::Open
-	return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Open(nsIInputStream* *result)
-{
-    nsAutoCMonitor mon(this);
-    nsresult rv;
-    mSynchronousRead = PR_TRUE;
-    rv = EnsureJARFileAvailable();
-    if (NS_FAILED(rv)) return rv;
-    if (mSynchronousInputStream == nsnull) 
-        mon.Wait();
-    if (mSynchronousInputStream)
-    {
-        *result = mSynchronousInputStream; // Result of GetInputStream called on transport thread
-        NS_ADDREF(*result);
-        mSynchronousInputStream = 0;
-        return NS_OK;
-    } 
-    else 
-        return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncOpen(nsIStreamListener* listener, nsISupports* ctxt)
-{
-    nsresult rv;
-    mUserContext = ctxt;
-    mUserListener = listener;
-
-    if (mLoadGroup) {
-        rv = mLoadGroup->AddRequest(this, nsnull);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    mSynchronousRead = PR_FALSE;
-    return EnsureJARFileAvailable();
-}
-
-nsresult
-nsJARChannel::EnsureJARFileAvailable()
-{
-    nsresult rv;
-    nsCOMPtr<nsIChannel> jarBaseChannel;
-    nsCOMPtr<nsIFile> jarCacheFile;
-    nsCOMPtr<nsIChannel> jarCacheTransport;
-    nsCOMPtr<nsIInputStream> jarBaseIn;
-
-#ifdef PR_LOGGING
-    nsXPIDLCString jarURLStr;
-    mURI->GetSpec(getter_Copies(jarURLStr));
-    PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-           ("nsJarProtocol: EnsureJARFileAvailable %s", (const char*)jarURLStr));
-#endif
-
-    rv = mURI->GetJARFile(getter_AddRefs(mJARBaseURI));
-    if (NS_FAILED(rv)) goto error;
-
-    rv = mURI->GetJAREntry(&mJAREntry);
-    if (NS_FAILED(rv)) goto error;
-
-    rv = NS_NewDownloader(getter_AddRefs(mDownloader),
-                          mJARBaseURI, this, nsnull, mSynchronousRead, mLoadGroup, mCallbacks, 
-                          mLoadFlags);
-
-    // if DownloadComplete() was called early, need to release the reference.
-    if (mSynchronousRead && mSynchronousInputStream)
-        mDownloader = null_nsCOMPtr();
-
-  error:
-    if (NS_FAILED(rv) && mLoadGroup) {
-        nsresult rv2 = mLoadGroup->RemoveRequest(this, nsnull, NS_OK);
-        NS_ASSERTION(NS_SUCCEEDED(rv2), "RemoveChannel failed");
-    }
-    return rv;
-}
-
-nsresult
-nsJARChannel::AsyncReadJARElement()
-{
-    nsresult rv;
-
-    nsAutoMonitor monitor(mMonitor);
-
-    NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsITransport> jarTransport;
-    rv = fts->CreateTransportFromStreamIO(this, getter_AddRefs(jarTransport));
-    if (NS_FAILED(rv)) return rv;
-
-    if (mCallbacks) {
-        nsCOMPtr<nsIProgressEventSink> sink = do_GetInterface(mCallbacks);
-        if (sink) {
-            // don't think that this is not needed anymore 
-            // jarTransport->SetProgressEventSink(sink);
-        }
-    }
-
-#ifdef PR_LOGGING
-    nsXPIDLCString jarURLStr;
-    mURI->GetSpec(getter_Copies(jarURLStr));
-    PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-           ("nsJarProtocol: AsyncRead jar entry %s", (const char*)jarURLStr));
-#endif
-
-    rv = jarTransport->AsyncRead(this, nsnull, 0, PRUint32(-1), 0,
-                                 getter_AddRefs(mJarExtractionTransport));
-    mJarExtractionTransport = 0;
-    jarTransport = 0;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetLoadFlags(PRUint32* aLoadFlags)
-{
-    *aLoadFlags = mLoadFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetLoadFlags(PRUint32 aLoadFlags)
-{
-    mLoadFlags = aLoadFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetContentType(char* *aContentType)
-{
-    nsresult rv = NS_OK;
-    if (mContentType == nsnull) {
-        if (!mJAREntry)
-            return NS_ERROR_FAILURE;
-        char* fileName = nsCRT::strdup(mJAREntry);
-        if (fileName != nsnull) {
-            PRInt32 len = nsCRT::strlen(fileName);
-            const char* ext = nsnull;
-            for (PRInt32 i = len-1; i >= 0; i--) {
-                if (fileName[i] == '.') {
-                    ext = &fileName[i + 1];
-                    break;
-                }
-            }
-
-            if (ext) {
-                nsCOMPtr<nsIMIMEService> mimeServ (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
-                if (NS_SUCCEEDED(rv)) {
-                    rv = mimeServ->GetTypeFromExtension(ext, &mContentType);
-                }
-            }
-            else 
-                rv = NS_ERROR_OUT_OF_MEMORY;
-		
-            nsCRT::free(fileName);
-        } 
-        else {
-            rv = NS_ERROR_OUT_OF_MEMORY;
-        }
-
-        if (NS_FAILED(rv)) {
-            mContentType = nsCRT::strdup(UNKNOWN_CONTENT_TYPE);
-            if (mContentType == nsnull)
-                rv = NS_ERROR_OUT_OF_MEMORY;
-            else
-                rv = NS_OK;
-        }
-    }
-    if (NS_SUCCEEDED(rv)) {
-        *aContentType = nsCRT::strdup(mContentType);
-        if (*aContentType == nsnull)
-            rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetContentType(const char *aContentType)
-{
-    if (mContentType) {
-        nsCRT::free(mContentType);
-    }
-
-    mContentType = nsCRT::strdup(aContentType);
-    if (!mContentType) return NS_ERROR_OUT_OF_MEMORY;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetContentLength(PRInt32* aContentLength)
-{
-    if (mContentLength == -1)
-        return NS_ERROR_FAILURE;
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetContentLength(PRInt32 aContentLength)
-{
-    NS_NOTREACHED("nsJARChannel::SetContentLength");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    mLoadGroup = aLoadGroup;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetOwner(nsISupports* *aOwner)
-{
-    nsresult rv;
-    if (mOwner == nsnull) {
-        //-- Verify signature, if one is present, and set owner accordingly
-        rv = EnsureZipReader();
-        if (NS_FAILED(rv)) return rv;
-
-        nsCOMPtr<nsIJAR> jar = do_QueryInterface(mJAR, &rv);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Zip reader is not an nsIJAR");
-        nsCOMPtr<nsIPrincipal> certificate;
-        rv = jar->GetCertificatePrincipal(mJAREntry, 
-                                           getter_AddRefs(certificate));
-        if (NS_FAILED(rv)) return rv;
-        if (certificate)
-        {   // Get the codebase principal
-            NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, 
-                            kScriptSecurityManagerCID, &rv);
-            if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-            nsCOMPtr<nsIPrincipal> codebase;
-            rv = secMan->GetCodebasePrincipal(mJARBaseURI, 
-                                              getter_AddRefs(codebase));
-            if (NS_FAILED(rv)) return rv;
-        
-            // Join the certificate and the codebase
-            nsCOMPtr<nsIAggregatePrincipal> agg;
-            agg = do_QueryInterface(certificate, &rv);
-            rv = agg->SetCodebase(codebase);
-            if (NS_FAILED(rv)) return rv;
-            mOwner = do_QueryInterface(agg, &rv);
-            if (NS_FAILED(rv)) return rv;
-        }
-    }
-    *aOwner = mOwner;
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsJARChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-    *aSecurityInfo = nsnull;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIDownloadObserver methods:
-
-NS_IMETHODIMP
-nsJARChannel::OnDownloadComplete(nsIDownloader* aDownloader, nsISupports* aClosure,
-                                 nsresult aStatus, nsIFile* aFile)
-{
-   nsresult rv=aStatus;
-   if(NS_SUCCEEDED(aStatus)) {
-       NS_ASSERTION(!mDownloader ||(aDownloader == mDownloader.get()), "wrong downloader");
-       mDownloadedJARFile = aFile;
-       // after successfully downloading the jar file to the cache,
-       // start the extraction process:
-       if (mSynchronousRead)
-           rv = OpenJARElement();
-       else
-           rv = AsyncReadJARElement();
-   }
-   mDownloader = 0;
-   return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequestObserver methods:
-
-NS_IMETHODIMP
-nsJARChannel::OnStartRequest(nsIRequest* jarExtractionTransport,
-                             nsISupports* context)
-{
-    return mUserListener->OnStartRequest(this, mUserContext);
-}
-
-NS_IMETHODIMP
-nsJARChannel::OnStopRequest(nsIRequest* jarExtractionTransport, nsISupports* context, 
-                            nsresult aStatus)
-{
-    nsresult rv;
-#ifdef PR_LOGGING
-    nsCOMPtr<nsIURI> jarURI;
-    nsXPIDLCString jarURLStr;
-    rv = mURI->GetSpec(getter_Copies(jarURLStr));
-    if (NS_SUCCEEDED(rv)) {
-        PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-               ("nsJarProtocol: jar extraction complete %s status=%x",
-                (const char*)jarURLStr, aStatus));
-    }
-#endif
-
-    rv = mUserListener->OnStopRequest(this, mUserContext, aStatus);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "OnStopRequest failed");
-
-    if (mLoadGroup)
-        mLoadGroup->RemoveRequest(this, context, aStatus);
-
-    mUserListener = nsnull;
-    mUserContext = nsnull;
-    mJarExtractionTransport = nsnull;
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamListener methods:
-
-NS_IMETHODIMP
-nsJARChannel::OnDataAvailable(nsIRequest* jarCacheTransport, 
-                              nsISupports* context, 
-                              nsIInputStream *inStr, 
-                              PRUint32 sourceOffset, 
-                              PRUint32 count)
-{
-    return mUserListener->OnDataAvailable(this, mUserContext, 
-                                          inStr, sourceOffset, count);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamIO methods:
-
-nsresult
-nsJARChannel::EnsureZipReader()
-{
-    if (mJAR == nsnull) {
-        nsresult rv;
-        if (mDownloadedJARFile == nsnull)
-            return NS_ERROR_FAILURE;
-
-        nsCOMPtr<nsIZipReaderCache> jarCache;
-        rv = mJARProtocolHandler->GetJARCache(getter_AddRefs(jarCache));
-        if (NS_FAILED(rv)) return rv; 
-
-        rv = jarCache->GetZip(mDownloadedJARFile, getter_AddRefs(mJAR));
-        if (NS_FAILED(rv)) return rv; 
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Open(char* *contentType, PRInt32 *contentLength) 
-{
-    nsresult rv;
-    rv = EnsureZipReader();
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIZipEntry> entry;
-    rv = mJAR->GetEntry(mJAREntry, getter_AddRefs(entry));
-    if (NS_FAILED(rv)) return rv;
-
-    if (contentLength) {
-        rv = entry->GetRealSize((PRUint32*)contentLength);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    if (contentType) {
-        rv = GetContentType(contentType);
-        if (NS_FAILED(rv)) return rv;
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Close(nsresult status) 
-{
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetInputStream(nsIInputStream* *aInputStream) 
-{
-#ifdef PR_LOGGING
-    nsXPIDLCString jarURLStr;
-    mURI->GetSpec(getter_Copies(jarURLStr));
-    PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-           ("nsJarProtocol: GetInputStream jar entry %s", (const char*)jarURLStr));
-#endif
-    NS_ENSURE_TRUE(mJAR, NS_ERROR_NULL_POINTER);
-    return mJAR->GetInputStream(mJAREntry, aInputStream);
-}
- 
-NS_IMETHODIMP
-nsJARChannel::GetOutputStream(nsIOutputStream* *aOutputStream) 
-{
-	NS_NOTREACHED("nsJARChannel::GetOutputStream");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetName(char* *aName) 
-{
-    return mURI->GetSpec(aName);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIJARChannel methods:
-
-NS_IMETHODIMP
-nsJARChannel::EnumerateEntries(const char *aRoot, nsISimpleEnumerator **_retval)
-{
-	NS_NOTREACHED("nsJARChannel::EnumerateEntries");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARChannel.h

@@ -1,111 +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,2000 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsJARChannel_h__
-#define nsJARChannel_h__
-
-#include "nsIJARChannel.h"
-#include "nsIStreamListener.h"
-#include "nsIJARProtocolHandler.h"
-#include "nsIJARURI.h"
-#include "nsIStreamIO.h"
-#include "nsIChannel.h"
-#include "nsIZipReader.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsIFile.h"
-#include "prmon.h"
-#include "nsIDownloader.h"
-#include "nsIInputStream.h"
-
-class nsIFileChannel;
-class nsJARChannel;
-
-#define NS_JARCHANNEL_CID							 \
-{ /* 0xc7e410d5-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d5,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-class nsJARChannel : public nsIJARChannel, 
-                     public nsIStreamListener,
-                     public nsIStreamIO,
-                     public nsIDownloadObserver
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSIJARCHANNEL
-    NS_DECL_NSIREQUESTOBSERVER
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSISTREAMIO
-    NS_DECL_NSIDOWNLOADOBSERVER
-
-    nsJARChannel();
-    virtual ~nsJARChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init(nsIJARProtocolHandler* aHandler, nsIURI* uri);
-    nsresult EnsureJARFileAvailable();
-    nsresult OpenJARElement();
-    nsresult AsyncReadJARElement();
-    nsresult EnsureZipReader();
-
-    friend class nsJARDownloadObserver;
-
-protected:
-    nsCOMPtr<nsIJARProtocolHandler>     mJARProtocolHandler;
-	nsCOMPtr<nsIJARURI>                 mURI;
-	nsCOMPtr<nsILoadGroup>              mLoadGroup;
-	nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-	nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsLoadFlags                         mLoadFlags;
-    nsCOMPtr<nsISupports>               mOwner;
-
-    nsCOMPtr<nsISupports>               mUserContext;
-    nsCOMPtr<nsIStreamListener>         mUserListener;
-
-    char*                               mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsIURI>                    mJARBaseURI;
-    char*                               mJAREntry;
-    nsCOMPtr<nsIZipReader>              mJAR;
-    nsCOMPtr<nsIFile>                   mDownloadedJARFile;
-    nsresult                            mStatus;
-    PRBool                              mSynchronousRead;
-    nsCOMPtr<nsIInputStream>            mSynchronousInputStream;
-
-    PRMonitor*                          mMonitor;
-    nsCOMPtr<nsIDownloader>             mDownloader;
-    nsCOMPtr<nsIRequest>                mJarExtractionTransport;
-
-};
-
-#endif // nsJARChannel_h__

mozilla/modules/libjar/nsJARProtocolHandler.cpp

@@ -1,162 +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): 
- */
-
-#include "nsJARProtocolHandler.h"
-#include "nsIIOService.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsJARURI.h"
-#include "nsIURL.h"
-#include "nsJARChannel.h"
-#include "nsXPIDLString.h"
-#include "nsNetCID.h"
-
-static NS_DEFINE_CID(kIOServiceCID,      NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kJARUriCID,         NS_JARURI_CID);
-static NS_DEFINE_CID(kZipReaderCacheCID, NS_ZIPREADERCACHE_CID);
-
-#define NS_JAR_CACHE_SIZE       32
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsJARProtocolHandler::nsJARProtocolHandler()
-{
-    NS_INIT_REFCNT();
-}
-
-nsresult
-nsJARProtocolHandler::Init()
-{
-    nsresult rv;
-	rv = nsComponentManager::CreateInstance(kZipReaderCacheCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIZipReaderCache),
-                                            getter_AddRefs(mJARCache));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = mJARCache->Init(NS_JAR_CACHE_SIZE);
-    return rv;
-}
-
-nsJARProtocolHandler::~nsJARProtocolHandler()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsJARProtocolHandler, 
-                              nsIJARProtocolHandler, 
-                              nsIProtocolHandler)
-
-NS_METHOD
-nsJARProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARProtocolHandler* ph = new nsJARProtocolHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->Init();
-    if (NS_SUCCEEDED(rv)) {
-        rv = ph->QueryInterface(aIID, aResult);
-    }
-    NS_RELEASE(ph);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::GetJARCache(nsIZipReaderCache* *result)
-{
-    *result = mJARCache;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsJARProtocolHandler::GetScheme(char* *result)
-{
-    *result = nsCRT::strdup("jar");
-    if (*result == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::GetDefaultPort(PRInt32 *result)
-{
-    *result = -1;        // no port for JAR: URLs
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result)
-{
-    nsresult rv = NS_OK;
-    nsIURI* url;
-
-    rv = nsJARURI::Create(nsnull, NS_GET_IID(nsIJARURI), (void**)&url);
-    if (NS_FAILED(rv)) return rv;
-
-    if (aBaseURI)
-    {
-        nsXPIDLCString aResolvedURI;
-        rv = aBaseURI->Resolve(aSpec, getter_Copies(aResolvedURI));
-        if (NS_FAILED(rv)) return rv;
-        rv = url->SetSpec(aResolvedURI);
-    } else {
-        rv = url->SetSpec((char*)aSpec);
-    }
-
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
-{
-    nsresult rv;
-    
-	nsJARChannel* channel;
-    rv = nsJARChannel::Create(nsnull, NS_GET_IID(nsIJARChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-	rv = channel->Init(this, uri);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARProtocolHandler.h

@@ -1,61 +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): 
- */
-
-#ifndef nsJARProtocolHandler_h___
-#define nsJARProtocolHandler_h___
-
-#include "nsIJARProtocolHandler.h"
-#include "nsIProtocolHandler.h"
-#include "nsIJARURI.h"
-#include "nsIZipReader.h"
-#include "nsCOMPtr.h"
-
-#define NS_JARPROTOCOLHANDLER_CID					 \
-{ /* 0xc7e410d4-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d4,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-
-class nsJARProtocolHandler : public nsIJARProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-	NS_DECL_NSIPROTOCOLHANDLER
-	NS_DECL_NSIJARPROTOCOLHANDLER
-
-    // nsJARProtocolHandler methods:
-    nsJARProtocolHandler();
-    virtual ~nsJARProtocolHandler();
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-
-protected:
-    nsCOMPtr<nsIZipReaderCache> mJARCache;
-};
-
-#endif /* nsJARProtocolHandler_h___ */

mozilla/modules/libjar/nsJARURI.cpp

@@ -1,396 +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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsJARURI.h"
-#include "nsNetUtil.h"
-#include "nsIIOService.h"
-#include "nsFileSpec.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIZipReader.h"
-
-static NS_DEFINE_CID(kIOServiceCID,     NS_IOSERVICE_CID);
- 
-////////////////////////////////////////////////////////////////////////////////
- 
-nsJARURI::nsJARURI()
-    : mJAREntry(nsnull)
-{
-    NS_INIT_REFCNT();
-}
- 
-nsJARURI::~nsJARURI()
-{
-    if (mJAREntry)
-        nsMemory::Free(mJAREntry);
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsJARURI, nsIJARURI, nsIURI)
-
-NS_METHOD
-nsJARURI::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARURI* uri = new nsJARURI();
-
-    if (uri == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(uri);
-    nsresult rv = uri->Init();
-
-    if (NS_SUCCEEDED(rv)) {
-        rv = uri->QueryInterface(aIID, aResult);
-    }
-    NS_RELEASE(uri);
-
-    return rv;
-}
- 
-nsresult
-nsJARURI::Init()
-{
-    return NS_OK;
-}
-
-#define NS_JAR_SCHEME           "jar:"
-#define NS_JAR_DELIMITER        "!/"
-
-nsresult
-nsJARURI::FormatSpec(const char* entryPath, char* *result)
-{
-    nsresult rv;
-    char* jarFileSpec;
-    rv = mJARFile->GetSpec(&jarFileSpec);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCString spec(NS_JAR_SCHEME);
-    spec += jarFileSpec;
-    nsCRT::free(jarFileSpec);
-    spec += NS_JAR_DELIMITER;
-    spec += entryPath;
-    
-    *result = nsCRT::strdup(spec);
-    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsURI methods:
-
-NS_IMETHODIMP
-nsJARURI::GetSpec(char* *aSpec)
-{
-    return FormatSpec(mJAREntry, aSpec);
-}
-
-NS_IMETHODIMP
-nsJARURI::SetSpec(const char * aSpec)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    PRUint32 startPos, endPos;
-    rv = serv->ExtractScheme(aSpec, &startPos, &endPos, nsnull);
-    if (NS_FAILED(rv)) return rv;
-
-    if (nsCRT::strncmp("jar", &aSpec[startPos], endPos - startPos - 1) != 0)
-        return NS_ERROR_MALFORMED_URI;
-
-    // Search backward from the end for the "!/" delimiter. Remember, jar URLs
-    // can nest, e.g.:
-    //    jar:jar:http://www.foo.com/bar.jar!/a.jar!/b.html
-    // This gets the b.html document from out of the a.jar file, that's 
-    // contained within the bar.jar file.
-
-    nsCAutoString jarPath(aSpec);
-    PRInt32 pos = jarPath.RFind(NS_JAR_DELIMITER);
-    if (pos == -1 || endPos + 1 > (PRUint32)pos)
-        return NS_ERROR_MALFORMED_URI;
-
-    jarPath.Cut(pos, jarPath.Length());
-    jarPath.Cut(0, endPos);
-
-    rv = serv->NewURI(jarPath, nsnull, getter_AddRefs(mJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCAutoString entry(aSpec);
-    entry.Cut(0, pos + 2);      // 2 == strlen(NS_JAR_DELIMITER)
-    while (entry.CharAt(0) == '/')
-        entry.Cut(0,1); // Strip any additional leading slashes from entry path
-
-    rv = serv->ResolveRelativePath(entry, nsnull, &mJAREntry);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPrePath(char* *prePath)
-{
-    *prePath = nsCRT::strdup("jar:");
-    return *prePath ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPrePath(const char* prePath)
-{
-    NS_NOTREACHED("nsJARURI::SetPrePath");
-    return NS_ERROR_NOT_IMPLEMENTED; 
-}
-
-NS_IMETHODIMP
-nsJARURI::GetScheme(char * *aScheme)
-{
-    *aScheme = nsCRT::strdup("jar");
-    return *aScheme ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetScheme(const char * aScheme)
-{
-    // doesn't make sense to set the scheme of a jar: URL
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetUsername(char * *aUsername)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetUsername(const char * aUsername)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPassword(char * *aPassword)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPassword(const char * aPassword)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPreHost(char * *aPreHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPreHost(const char * aPreHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetHost(char * *aHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetHost(const char * aHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPort(PRInt32 *aPort)
-{
-    return NS_ERROR_FAILURE;
-}
- 
-NS_IMETHODIMP
-nsJARURI::SetPort(PRInt32 aPort)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPath(char * *aPath)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPath(const char * aPath)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::Equals(nsIURI *other, PRBool *result)
-{
-    nsresult rv;
-    *result = PR_FALSE;
-
-    if (other == nsnull)
-        return NS_OK;	// not equal
-
-    nsJARURI* otherJAR;
-    rv = other->QueryInterface(NS_GET_IID(nsIJARURI), (void**)&otherJAR);
-    if (NS_FAILED(rv))
-        return NS_OK;   // not equal
-
-    nsCOMPtr<nsIURI> otherJARFile;
-    rv = otherJAR->GetJARFile(getter_AddRefs(otherJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    PRBool equal;
-    rv = mJARFile->Equals(otherJARFile, &equal);
-    if (NS_FAILED(rv)) return rv;
-    if (!equal)
-        return NS_OK;   // not equal
-
-    char* otherJAREntry;
-    rv = otherJAR->GetJAREntry(&otherJAREntry);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = nsCRT::strcmp(mJAREntry, otherJAREntry) == 0;
-    nsCRT::free(otherJAREntry);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::SchemeIs(const char *i_Scheme, PRBool *o_Equals)
-{
-    NS_ENSURE_ARG_POINTER(o_Equals);
-    if (!i_Scheme) return NS_ERROR_INVALID_ARG;
-
-    if (*i_Scheme == 'j' || *i_Scheme == 'J') {
-        *o_Equals = PL_strcasecmp("jar", i_Scheme) ? PR_FALSE : PR_TRUE;
-    } else {
-        *o_Equals = PR_FALSE;
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::Clone(nsIURI **result)
-{
-    nsresult rv;
-
-    nsCOMPtr<nsIURI> newJARFile;
-    rv = mJARFile->Clone(getter_AddRefs(newJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    char* newJAREntry = nsCRT::strdup(mJAREntry);
-    if (newJAREntry == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsJARURI* uri = new nsJARURI();
-    if (uri == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(uri);
-    uri->mJARFile = newJARFile;
-    uri->mJAREntry = newJAREntry;
-    *result = uri;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::Resolve(const char *relativePath, char **result)
-{
-    nsresult rv;
-
-    if (!relativePath) return NS_ERROR_NULL_POINTER;
-
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsXPIDLCString scheme;
-    rv = serv->ExtractScheme(relativePath, nsnull, nsnull, getter_Copies(scheme));
-    if (NS_SUCCEEDED(rv)) {
-        // then aSpec is absolute
-        *result = nsCRT::strdup(relativePath);
-        if (*result == nsnull)
-            return NS_ERROR_OUT_OF_MEMORY;
-        return NS_OK;
-    }
-
-    nsCAutoString path(mJAREntry);
-    PRInt32 pos = path.RFind("/");
-    if (pos >= 0)
-        path.Truncate(pos + 1);
-    else
-        path = "";
-
-    char* resolvedEntry;
-    rv = serv->ResolveRelativePath(relativePath, path.get(),
-                                   &resolvedEntry);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = FormatSpec(resolvedEntry, result);
-    nsCRT::free(resolvedEntry);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIJARUri methods:
-
-NS_IMETHODIMP
-nsJARURI::GetJARFile(nsIURI* *jarFile)
-{
-    *jarFile = mJARFile;
-    NS_ADDREF(*jarFile);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetJARFile(nsIURI* jarFile)
-{
-    mJARFile = jarFile;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetJAREntry(char* *entryPath)
-{
-    nsCAutoString entry(mJAREntry);
-    PRInt32 pos = entry.RFindCharInSet("#?;");
-    if (pos >= 0)
-        entry.Truncate(pos);
-    *entryPath = entry.ToNewCString();
-    return *entryPath ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetJAREntry(const char* entryPath)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    if (mJAREntry)
-        nsCRT::free(mJAREntry);
-
-    rv = serv->ResolveRelativePath(entryPath, nsnull, &mJAREntry);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARURI.h

@@ -1,55 +0,0 @@
-/* -*- Mode: IDL; 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsJARURI_h__
-#define nsJARURI_h__
-
-#include "nsIJARURI.h"
-#include "nsCOMPtr.h"
-
-#define NS_JARURI_CID					 \
-{ /* 0xc7e410d7-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d7,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-class nsJARURI : public nsIJARURI
-{
-public:    
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIURI
-    NS_DECL_NSIJARURI
-
-    // nsJARURI
-    nsJARURI();
-    virtual ~nsJARURI();
-   
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-    nsresult FormatSpec(const char* entryPath, char* *result);
-
-protected:
-    nsCOMPtr<nsIURI> mJARFile;
-    char *mJAREntry;
-};
-
-#endif // nsJARURI_h__

mozilla/modules/libpr0n/Makefile.in

@@ -3,28 +3,31 @@
 # 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/MPL/
-#
+# 
 # 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
 #
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Bradley Baetz
-# Portions created by Brian Ryner are Copyright (C) 2000 Bradley Baetz.
-# All Rights Reserved.
-#
-# Contributor(s): 
-#  Bradley Baetz <bbaetz@student.usyd.edu.au>
 
-DEPTH		= ../../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+DIRS		= public src decoders
 
 include $(topsrcdir)/config/rules.mk
+
+

mozilla/modules/libpr0n/decoders/Makefile.in

@@ -3,21 +3,21 @@
 # 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/MPL/
-#
+# 
 # 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 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
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
 # Rights Reserved.
+# 
+# Contributor(s):
 #
-# Contributor(s): 
-#  Chak Nanga <chak@netscape.com>
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -26,6 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+DIRS		= ppm png gif jpeg
 
 include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/gif/GIF2.h

@@ -0,0 +1,323 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Communicator client 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): 
+ */
+#ifndef _GIF_H_
+#define _GIF_H_
+
+/* gif2.h  
+   The interface for the GIF87/89a decoder. 
+*/
+// List of possible parsing states
+typedef enum {
+    gif_gather,
+    gif_init,                   //1
+    gif_type,
+    gif_version,
+    gif_global_header,
+    gif_global_colormap,
+    gif_image_start,            //6
+    gif_image_header,
+    gif_image_colormap,
+    gif_image_body,
+    gif_lzw_start,
+    gif_lzw,                    //11
+    gif_sub_block,
+    gif_extension,
+    gif_control_extension,
+    gif_consume_block,
+    gif_skip_block,
+    gif_done,                   //17
+    gif_oom,
+    gif_error,
+    gif_comment_extension,
+    gif_application_extension,
+    gif_netscape_extension_block,
+    gif_consume_netscape_extension,
+    gif_consume_comment,
+    gif_delay,
+    gif_wait_for_buffer_full,
+    gif_stop_animating   //added for animation stop 
+} gstate;
+
+/* "Disposal" method indicates how the image should be handled in the
+   framebuffer before the subsequent image is displayed. */
+typedef enum 
+{
+    DISPOSE_NOT_SPECIFIED      = 0,
+    DISPOSE_KEEP               = 1, /* Leave it in the framebuffer */
+    DISPOSE_OVERWRITE_BGCOLOR  = 2, /* Overwrite with background color */
+    DISPOSE_OVERWRITE_PREVIOUS = 4  /* Save-under */
+} gdispose;
+
+/* A RGB triplet representing a single pixel in the image's colormap
+   (if present.) */
+typedef struct _GIF_RGB
+{
+  PRUint8 red, green, blue, pad; /* Windows requires the fourth byte &
+                                    many compilers pad it anyway. */
+                    
+  /* XXX: hist_count appears to be unused */                                  
+  //PRUint16 hist_count;           /* Histogram frequency count. */
+} GIF_RGB;
+    
+/* Colormap information. */
+typedef struct _GIF_ColorMap {
+    int32 num_colors;           /* Number of colors in the colormap.
+                                   A negative value can be used to denote a
+                                   possibly non-unique set. */
+    GIF_RGB *map;                /* Colormap colors. */
+    PRUint8 *index;             /* NULL, if map is in index order.  Otherwise
+                                   specifies the indices of the map entries. */
+    void *table;                /* Lookup table for this colormap.  Private to
+                                   the Image Library. */
+} GIF_ColorMap;
+    
+/* An indexed RGB triplet. */
+typedef struct _GIF_IRGB {
+    PRUint8 index;
+    PRUint8 red, green, blue;
+} GIF_IRGB;
+
+/* A GIF decoder's state */
+typedef struct gif_struct {
+    void* clientptr;
+    /* Callbacks for this decoder instance*/
+    int (PR_CALLBACK *GIFCallback_NewPixmap)();
+    int (PR_CALLBACK *GIFCallback_BeginGIF)(
+      void*    aClientData,
+      PRUint32 aLogicalScreenWidth, 
+      PRUint32 aLogicalScreenHeight,
+      PRUint8  aLogicalScreenBackgroundRGBIndex);
+      
+    int (PR_CALLBACK* GIFCallback_EndGIF)(
+      void*    aClientData,
+      int      aAnimationLoopCount);
+      
+    int (PR_CALLBACK* GIFCallback_BeginImageFrame)(
+      void*    aClientData,
+      PRUint32 aFrameNumber,   /* Frame number, 1-n */
+      PRUint32 aFrameXOffset,  /* X offset in logical screen */
+      PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+      PRUint32 aFrameWidth,    
+      PRUint32 aFrameHeight,   
+      GIF_RGB* aTransparencyChromaKey);
+    int (PR_CALLBACK* GIFCallback_EndImageFrame)(
+      void* aClientData,
+      PRUint32 aFrameNumber,
+      PRUint32 aDelayTimeout);
+    int (PR_CALLBACK* GIFCallback_SetupColorspaceConverter)();
+    int (PR_CALLBACK* GIFCallback_ResetPalette)(); 
+    int (PR_CALLBACK* GIFCallback_InitTransparentPixel)();
+    int (PR_CALLBACK* GIFCallback_DestroyTransparentPixel)();
+    int (PR_CALLBACK* GIFCallback_HaveDecodedRow)(
+      void* aClientData,
+      PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
+      PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
+      int aXOffset,          /* With respect to GIF logical screen origin */
+      int aLength,           /* Length of the row? */
+      int aRow,              /* Row number? */
+      int aDuplicateCount,   /* Number of times to duplicate the row? */
+      PRUint8 aDrawMode,     /* il_draw_mode */
+      int aInterlacePass);
+    int (PR_CALLBACK *GIFCallback_HaveImageAll)(
+      void* aClientData);
+        
+    /* Parsing state machine */
+    gstate state;               /* Curent decoder master state */
+    PRUint8 *hold;                /* Accumulation buffer */
+    int32 hold_size;            /* Capacity, in bytes, of accumulation buffer */
+    PRUint8 *gather_head;         /* Next byte to read in accumulation buffer */
+    int32 gather_request_size;  /* Number of bytes to accumulate */
+    int32 gathered;             /* bytes accumulated so far*/
+    gstate post_gather_state;   /* State after requested bytes accumulated */
+    int32 requested_buffer_fullness; /* For netscape application extension */
+
+    /* LZW decoder state machine */
+    PRUint8 *stack;               /* Base of decoder stack */
+    PRUint8 *stackp;              /* Current stack pointer */
+    PRUint16 *prefix;
+    PRUint8 *suffix;
+    int datasize;
+    int codesize;
+    int codemask;
+    int clear_code;             /* Codeword used to trigger dictionary reset */
+    int avail;                  /* Index of next available slot in dictionary */
+    int oldcode;
+    PRUint8 firstchar;
+    int count;                  /* Remaining # bytes in sub-block */
+    int bits;                   /* Number of unread bits in "datum" */
+    int32 datum;                /* 32-bit input buffer */
+
+    /* Output state machine */
+    int ipass;                  /* Interlace pass; Ranges 1-4 if interlaced. */
+    PRUintn rows_remaining;        /* Rows remaining to be output */
+    PRUintn irow;                  /* Current output row, starting at zero */
+    PRUint8 *rgbrow;              /* Temporary storage for dithering/mapping */
+    PRUint8 *rowbuf;              /* Single scanline temporary buffer */
+    PRUint8 *rowend;              /* Pointer to end of rowbuf */
+    PRUint8 *rowp;                /* Current output pointer */
+
+    /* Parameters for image frame currently being decoded*/
+    PRUintn x_offset, y_offset;    /* With respect to "screen" origin */
+    PRUintn height, width;
+    PRUintn last_x_offset, last_y_offset; /* With respect to "screen" origin */
+    PRUintn last_height, last_width;
+    int interlaced;             /* TRUE, if scanlines arrive interlaced order */
+    int tpixel;                 /* Index of transparent pixel */
+    GIF_IRGB* transparent_pixel;
+    int is_transparent;         /* TRUE, if tpixel is valid */
+    int control_extension;      /* TRUE, if image control extension present */
+    int is_local_colormap_defined;
+    gdispose disposal_method;   /* Restore to background, leave in place, etc.*/
+    gdispose last_disposal_method;
+    GIF_RGB *local_colormap;     /* Per-image colormap */
+    int local_colormap_size;    /* Size of local colormap array. */
+    PRUint32 delay_time;        /* Display time, in milliseconds,
+                                   for this image in a multi-image GIF */
+
+    /* Global (multi-image) state */
+    int screen_bgcolor;         /* Logical screen background color */
+    int version;                /* Either 89 for GIF89 or 87 for GIF87 */
+    PRUintn screen_width;       /* Logical screen width & height */
+    PRUintn screen_height;
+    GIF_RGB *global_colormap;    /* Default colormap if local not supplied  */
+    int global_colormap_size;   /* Size of global colormap array. */
+    int images_decoded;         /* Counts images for multi-part GIFs */
+    int destroy_pending;        /* Stream has ended */
+    int progressive_display;    /* If TRUE, do Haeberli interlace hack */
+    int loop_count;             /* Netscape specific extension block to control
+                                   the number of animation loops a GIF renders. */
+} gif_struct;
+
+
+/* Create a new gif_struct */
+extern PRBool gif_create(gif_struct **gs);
+
+/* These are the APIs that the client calls to intialize,
+push data to, and shut down the GIF decoder. */
+PRBool GIFInit(
+  gif_struct* gs,
+
+  void* aClientData,
+  
+  int (*PR_CALLBACK GIFCallback_NewPixmap)(),
+  
+  int (*PR_CALLBACK GIFCallback_BeginGIF)(
+    void* aClientData,
+    PRUint32 aLogicalScreenWidth, 
+    PRUint32 aLogicalScreenHeight,
+    PRUint8  aBackgroundRGBIndex),
+    
+  int (*PR_CALLBACK GIFCallback_EndGIF)(
+    void*    aClientData,
+    int      aAnimationLoopCount),
+  
+  int (*PR_CALLBACK GIFCallback_BeginImageFrame)(
+    void*    aClientData,
+    PRUint32 aFrameNumber,   /* Frame number, 1-n */
+    PRUint32 aFrameXOffset,  /* X offset in logical screen */
+    PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+    PRUint32 aFrameWidth,    
+    PRUint32 aFrameHeight,   
+    GIF_RGB* aTransparencyChromaKey),
+  
+  int (*PR_CALLBACK GIFCallback_EndImageFrame)(
+    void* aClientData,
+    PRUint32 aFrameNumber,
+    PRUint32 aDelayTimeout),
+  
+  int (*PR_CALLBACK GIFCallback_SetupColorspaceConverter)(),
+  
+  int (*PR_CALLBACK GIFCallback_ResetPalette)(),
+  
+  int (*PR_CALLBACK GIFCallback_InitTransparentPixel)(),
+  
+  int (*PR_CALLBACK GIFCallback_DestroyTransparentPixel)(),
+  
+  int (*PR_CALLBACK GIFCallback_HaveDecodedRow)(
+    void* aClientData,
+    PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
+    PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
+    int aXOffset,          /* With respect to GIF logical screen origin */
+    int aLength,           /* Length of the row? */
+    int aRow,              /* Row number? */
+    int aDuplicateCount,   /* Number of times to duplicate the row? */
+    PRUint8 aDrawMode,     /* il_draw_mode */
+    int aInterlacePass),
+    
+  int (*PR_CALLBACK GIFCallback_HaveImageAll)(
+    void* aClientData)
+  );
+
+extern void gif_destroy(gif_struct* aGIFStruct);
+
+int gif_write(gif_struct* aGIFStruct, const PRUint8 * buf, PRUint32 numbytes);
+
+PRUint8 gif_write_ready(gif_struct* aGIFStruct);
+
+extern void gif_complete(gif_struct** aGIFStruct);
+extern void gif_delay_time_callback(/* void *closure */);
+
+
+/* Callback functions that the client must implement and pass in 
+pointers for during the GIFInit call. These will be called back
+when the decoder has a decoded rows, frame size information, etc.*/
+
+/* GIFCallback_LogicalScreenSize is called only once to notify the client
+of the logical screen size, which will be the size of the total image. */
+typedef int (*PR_CALLBACK BEGINGIF_CALLBACK)(
+  void*    aClientData,
+  PRUint32 aLogicalScreenWidth, 
+  PRUint32 aLogicalScreenHeight,
+  PRUint8  aLogicalScreenBackgroundRGBIndex);
+                            
+typedef int (PR_CALLBACK *GIFCallback_EndGIF)(
+  void*    aClientData,
+  int      aAnimationLoopCount);
+
+/* GIFCallback_BeginImageFrame is called at the beginning of each frame of
+a GIF.*/
+typedef int (PR_CALLBACK *GIFCallback_BeginImageFrame)(
+  void*    aClientData,
+  PRUint32 aFrameNumber,   /* Frame number, 1-n */
+  PRUint32 aFrameXOffset,  /* X offset in logical screen */
+  PRUint32 aFraqeYOffset,  /* Y offset in logical screen */
+  PRUint32 aFrameWidth,    
+  PRUint32 aFrameHeight); 
+
+extern int GIFCallback_EndImageFrame(
+  void*    aClientData,
+  PRUint32 aFrameNumber,
+  PRUint32 aDelayTimeout); /* Time in milliseconds this frame should be displayed before the next frame.
+                              This information appears in a sub control block, so we don't
+                              transmit it back to the client until we're done with the frame. */
+
+/*
+extern int GIFCallback_SetupColorspaceConverter();
+extern int GIFCallback_ResetPalette(); 
+extern int GIFCallback_InitTransparentPixel();
+extern int GIFCallback_DestroyTransparentPixel();
+*/
+extern int GIFCallback_HaveDecodedRow();
+extern int GIFCallback_HaveImageAll();
+
+#endif
+

mozilla/modules/libpr0n/decoders/gif/Makefile.in

@@ -3,21 +3,21 @@
 # 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/MPL/
-#
+# 
 # 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 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
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
 # Rights Reserved.
+# 
+# Contributor(s):
 #
-# Contributor(s): 
-#  Chak Nanga <chak@netscape.com>
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -26,18 +26,17 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-LIBRARY_NAME	= nkviewsource_s
-REQUIRES	= xpcom string mimetype
+MODULE		= imggif
+LIBRARY_NAME	= imggif
+IS_COMPONENT	= 1
 
-CPPSRCS		= \
-		nsViewSourceHandler.cpp \
-		nsViewSourceChannel.cpp \
+REQUIRES	= xpcom necko layout gfx2 imglib2
+
+CPPSRCS		= GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
+
+EXTRA_DSO_LDOPTS = $(GIF_LIBS) $(ZLIB_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
 include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/gif/makefile.win

@@ -0,0 +1,52 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imggif
+LIBRARY_NAME	= imggif
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsGIFDecoder2.obj \
+		.\$(OBJDIR)\GIF2.obj \
+		.\$(OBJDIR)\nsGIFModule.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp

@@ -0,0 +1,506 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *  Chris Saari <saari@netscape.com>
+ */
+
+#include "nsGIFDecoder2.h"
+#include "nsIInputStream.h"
+#include "nsIComponentManager.h"
+#include "nsIImage.h"
+#include "nsMemory.h"
+
+#include "imgIContainerObserver.h"
+
+#include "nsRect.h"
+
+//////////////////////////////////////////////////////////////////////
+// GIF Decoder Implementation
+// This is an adaptor between GIF2 and imgIDecoder
+
+NS_IMPL_ISUPPORTS2(nsGIFDecoder2, imgIDecoder, nsIOutputStream);
+
+nsGIFDecoder2::nsGIFDecoder2()
+{
+  NS_INIT_ISUPPORTS();
+  mImageFrame = nsnull;
+  
+  mGIFStruct = nsnull;
+
+  mAlphaLine = nsnull;
+}
+
+nsGIFDecoder2::~nsGIFDecoder2(void)
+{
+  if (mAlphaLine)
+    nsMemory::Free(mAlphaLine);
+
+  if (mGIFStruct) {
+    gif_destroy(mGIFStruct);
+    mGIFStruct = nsnull;
+  }
+}
+
+//******************************************************************************
+/** imgIDecoder methods **/
+//******************************************************************************
+
+//******************************************************************************
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsGIFDecoder2::Init(imgIRequest *aRequest)
+{
+  mImageRequest = aRequest;
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImageContainer));
+
+  /* do gif init stuff */
+  /* Always decode to 24 bit pixdepth */
+  
+  PRBool created = gif_create(&mGIFStruct);
+
+  NS_ASSERTION(created, "gif_create failed");
+
+  // Call GIF decoder init routine
+  GIFInit(
+    mGIFStruct,
+    this,
+    NewPixmap,
+    BeginGIF,
+    EndGIF,
+    BeginImageFrame,
+    EndImageFrame,
+    SetupColorspaceConverter,
+    ResetPalette,
+    InitTransparentPixel,
+    DestroyTransparentPixel,
+    HaveDecodedRow,
+    HaveImageAll);
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsGIFDecoder2::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mImageRequest;
+  NS_IF_ADDREF(*aRequest);
+      
+  return NS_OK;
+}
+
+
+//******************************************************************************
+/** nsIOutputStream methods **/
+//******************************************************************************
+
+//******************************************************************************
+/* void close (); */
+NS_IMETHODIMP nsGIFDecoder2::Close()
+{
+  if (mGIFStruct) {
+    gif_destroy(mGIFStruct);
+    mGIFStruct = nsnull;
+  }
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void flush (); */
+NS_IMETHODIMP nsGIFDecoder2::Flush()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsGIFDecoder2::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* static callback from nsIInputStream::ReadSegments */
+static NS_METHOD ReadDataOut(nsIInputStream* in,
+                             void* closure,
+                             const char* fromRawSegment,
+                             PRUint32 toOffset,
+                             PRUint32 count,
+                             PRUint32 *writeCount)
+{
+  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, closure);
+  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
+  return NS_OK;
+}
+
+//******************************************************************************
+PRUint32 nsGIFDecoder2::ProcessData(unsigned char *data, PRUint32 count)
+{
+  // Push the data to the GIF decoder
+  
+  // First we ask if the gif decoder is ready for more data, and if so, push it.
+  // In the new decoder, we should always be able to process more data since
+  // we don't wait to decode each frame in an animation now.
+  if(gif_write_ready(mGIFStruct)) {
+    gif_write(mGIFStruct, data, count);
+  }
+    
+
+  return count; // we always consume all the data
+}
+
+//******************************************************************************
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsGIFDecoder2::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  inStr->ReadSegments(
+    ReadDataOut, // Callback
+    this,     
+    count, 
+    _retval);
+
+    // if error
+    //mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
+  return NS_OK;
+}
+
+//******************************************************************************
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsGIFDecoder2::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsGIFDecoder2::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+//******************************************************************************
+NS_IMETHODIMP nsGIFDecoder2::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsGIFDecoder2::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+NS_IMETHODIMP nsGIFDecoder2::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+//******************************************************************************
+// GIF decoder callback methods. Part of pulic API for GIF2
+//******************************************************************************
+
+//******************************************************************************
+int BeginGIF(
+  void*    aClientData,
+  PRUint32 aLogicalScreenWidth, 
+  PRUint32 aLogicalScreenHeight,
+  PRUint8  aBackgroundRGBIndex)
+{
+  // copy GIF info into imagelib structs
+  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartDecode(nsnull, nsnull);
+
+  decoder->mImageContainer->Init(aLogicalScreenWidth, aLogicalScreenHeight, decoder->mObserver);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImageContainer);
+
+  return 0;
+}
+
+//******************************************************************************
+int EndGIF(
+    void*    aClientData,
+    int      aAnimationLoopCount)
+{
+  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  if (decoder->mObserver) {
+    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImageContainer);
+    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+  
+  decoder->mImageContainer->SetLoopCount(aAnimationLoopCount);
+  decoder->mImageContainer->DecodingComplete();
+  return 0;
+}
+
+//******************************************************************************
+int BeginImageFrame(
+  void*    aClientData,
+  PRUint32 aFrameNumber,   /* Frame number, 1-n */
+  PRUint32 aFrameXOffset,  /* X offset in logical screen */
+  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+  PRUint32 aFrameWidth,    
+  PRUint32 aFrameHeight,   
+  GIF_RGB* aTransparencyChromaKey) /* don't have this info yet */
+{
+  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  
+  decoder->mImageFrame = nsnull; // clear out our current frame reference
+  decoder->mGIFStruct->x_offset = aFrameXOffset;
+  decoder->mGIFStruct->y_offset = aFrameYOffset;
+  decoder->mGIFStruct->width = aFrameWidth;
+  decoder->mGIFStruct->height = aFrameHeight;
+
+  return 0;
+}
+
+//******************************************************************************
+int EndImageFrame(
+  void*    aClientData, 
+  PRUint32 aFrameNumber,
+  PRUint32 aDelayTimeout)  /* Time this frame should be displayed before the next frame 
+                              we can't have this in the image frame init because it doesn't
+                              show up in the GIF frame header, it shows up in a sub control
+                              block.*/
+{
+  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  
+  // We actually have the timeout information before we get the lzw encoded image
+  // data, at least according to the spec, but we delay in setting the timeout for
+  // the image until here to help ensure that we have the whole image frame decoded before
+  // we go off and try to display another frame.
+
+// XXXXXXXX
+  // decoder->mImageFrame->SetTimeout(aDelayTimeout);
+  decoder->mImageContainer->EndFrameDecode(aFrameNumber, aDelayTimeout);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mImageFrame);
+
+  decoder->mImageFrame = nsnull;
+  return 0;
+}
+  
+
+
+//******************************************************************************
+// GIF decoder callback
+int HaveImageAll(
+  void* aClientData)
+{
+  return 0;
+}
+
+//******************************************************************************
+// GIF decoder callback notification that it has decoded a row
+int HaveDecodedRow(
+  void* aClientData,
+  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
+  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
+  int aXOffset,          // With respect to GIF logical screen origin
+  int aLength,           // Length of the row?
+  int aRowNumber,        // Row number?
+  int aDuplicateCount,   // Number of times to duplicate the row?
+  PRUint8 aDrawMode,     // il_draw_mode
+  int aInterlacePass)    // interlace pass (1-4)
+{
+  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  PRUint32 bpr, abpr;
+  // We have to delay allocation of the image frame until now because
+  // we won't have control block info (transparency) until now. The conrol
+  // block of a GIF stream shows up after the image header since transparency
+  // is added in GIF89a and control blocks are how the extensions are done.
+  // How annoying.
+  if(! decoder->mImageFrame) {
+    gfx_format format = gfxIFormats::RGB;
+    if (decoder->mGIFStruct->is_transparent)
+      format = gfxIFormats::RGB_A1;
+
+#ifdef XP_PC
+    // XXX this works...
+    format += 1; // RGB to BGR
+#endif
+
+    // initalize the frame and append it to the container
+    decoder->mImageFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+    decoder->mImageFrame->Init(
+      decoder->mGIFStruct->x_offset, decoder->mGIFStruct->y_offset, 
+      decoder->mGIFStruct->width, decoder->mGIFStruct->height, format);
+      
+    decoder->mImageContainer->AppendFrame(decoder->mImageFrame);
+
+    if (decoder->mObserver)
+      decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mImageFrame);
+
+    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
+    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
+
+    if (format == gfxIFormats::RGB_A1 || format == gfxIFormats::BGR_A1) {
+      if (decoder->mAlphaLine)
+        nsMemory::Free(decoder->mAlphaLine);
+      decoder->mAlphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
+    }
+  } else {
+    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
+    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
+  }
+  
+  if (aRowBufPtr) {
+    nscoord width;
+
+    decoder->mImageFrame->GetWidth(&width);
+    PRUint32 iwidth = width;
+
+    gfx_format format;
+    decoder->mImageFrame->GetFormat(&format);
+
+    // XXX map the data into colors
+    int cmapsize;
+    GIF_RGB* cmap;
+    if(decoder->mGIFStruct->local_colormap) {
+      cmapsize = decoder->mGIFStruct->local_colormap_size;
+      cmap = decoder->mGIFStruct->local_colormap;
+    } else {
+      cmapsize = decoder->mGIFStruct->global_colormap_size;
+      cmap = decoder->mGIFStruct->global_colormap;
+    }
+
+    PRUint8* rgbRowIndex = aRGBrowBufPtr;
+    PRUint8* rowBufIndex = aRowBufPtr;
+        
+    switch (format) {
+    case gfxIFormats::RGB:
+      {
+        while(rowBufIndex != decoder->mGIFStruct->rowend) {
+#ifdef XP_MAC
+          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
+#endif
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+          ++rowBufIndex;
+        }
+
+        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
+      }
+      break;
+    case gfxIFormats::BGR:
+      {
+        while(rowBufIndex != decoder->mGIFStruct->rowend) {
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+          ++rowBufIndex;
+        }
+
+        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
+      }
+      break;
+    case gfxIFormats::RGB_A1:
+    case gfxIFormats::BGR_A1:
+      {
+        memset(aRGBrowBufPtr, 0, bpr);
+        memset(decoder->mAlphaLine, 0, abpr);
+        PRUint32 iwidth = (PRUint32)width;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          if (*rowBufIndex != decoder->mGIFStruct->tpixel) {
+#ifdef XP_PC
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+#else
+#ifdef XP_MAC
+          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
+#endif
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+#endif
+            decoder->mAlphaLine[x>>3] |= 1<<(7-x&0x7);
+          } else {
+#ifdef XP_MAC
+            rgbRowIndex+=4;
+#else
+            rgbRowIndex+=3;
+#endif
+          }
+
+          ++rowBufIndex;
+        }
+        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
+        decoder->mImageFrame->SetAlphaData(decoder->mAlphaLine, abpr, aRowNumber*abpr);
+      }
+      break;
+    default:
+      break;
+
+    }
+
+    nsRect r(0, aRowNumber, width, 1);
+
+    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mImageFrame, &r);
+  }
+
+  return 0;
+}
+
+//******************************************************************************
+int ResetPalette()
+{
+  return 0;
+}
+
+//******************************************************************************
+int SetupColorspaceConverter()
+{
+  return 0;
+}
+
+//******************************************************************************
+int EndImageFrame()
+{
+  return 0;
+}
+
+//******************************************************************************
+int NewPixmap()
+{
+  return 0;
+}
+
+//******************************************************************************
+int InitTransparentPixel()
+{
+  return 0;
+}
+
+//******************************************************************************
+int DestroyTransparentPixel()
+{
+  return 0;
+}

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h

@@ -0,0 +1,114 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *  Chris Saari <saari@netscape.com>
+ */
+
+#ifndef _nsGIFDecoder2_h
+#define _nsGIFDecoder2_h
+
+#include "nsCOMPtr.h"
+#include "imgIDecoder.h"
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+#include "GIF2.h"
+
+#define NS_GIFDECODER2_CID \
+{ /* 797bec5a-1dd2-11b2-a7f8-ca397e0179c4 */         \
+     0x797bec5a,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0xa7, 0xf8, 0xca, 0x39, 0x7e, 0x01, 0x79, 0xc4} \
+}
+
+//////////////////////////////////////////////////////////////////////
+// nsGIFDecoder2 Definition
+
+class nsGIFDecoder2 : public imgIDecoder   
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsGIFDecoder2();
+  virtual ~nsGIFDecoder2();
+
+  static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+  
+  NS_METHOD ProcessData(unsigned char *data, PRUint32 count);
+  
+  nsCOMPtr<imgIContainer> mImageContainer;
+  nsCOMPtr<gfxIImageFrame> mImageFrame;
+  nsCOMPtr<imgIRequest> mImageRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+  
+  gif_struct *mGIFStruct;
+  
+  PRUint8 *mAlphaLine;
+};
+
+// static callbacks for the GIF decoder
+static int PR_CALLBACK BeginGIF(
+  void*    aClientData,
+  PRUint32 aLogicalScreenWidth, 
+  PRUint32 aLogicalScreenHeight,
+  PRUint8  aBackgroundRGBIndex);
+  
+static int PR_CALLBACK HaveDecodedRow(
+  void* aClientData,
+  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
+  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
+  int aXOffset,          // With respect to GIF logical screen origin
+  int aLength,           // Length of the row?
+  int aRow,              // Row number?
+  int aDuplicateCount,   // Number of times to duplicate the row?
+  PRUint8 aDrawMode,     // il_draw_mode
+  int aInterlacePass);
+    
+static int PR_CALLBACK NewPixmap();
+
+static int PR_CALLBACK EndGIF(
+  void*    aClientData,
+  int      aAnimationLoopCount);
+  
+static int PR_CALLBACK BeginImageFrame(
+  void*    aClientData,
+  PRUint32 aFrameNumber,   /* Frame number, 1-n */
+  PRUint32 aFrameXOffset,  /* X offset in logical screen */
+  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+  PRUint32 aFrameWidth,    
+  PRUint32 aFrameHeight,   
+  GIF_RGB* aTransparencyChromaKey);
+static int PR_CALLBACK EndImageFrame(
+  void*    aClientData, 
+  PRUint32 aFrameNumber,
+  PRUint32 aDelayTimeout);
+static int PR_CALLBACK SetupColorspaceConverter();
+static int PR_CALLBACK ResetPalette();
+static int PR_CALLBACK InitTransparentPixel();
+static int PR_CALLBACK DestroyTransparentPixel();
+
+static int PR_CALLBACK HaveImageAll(
+  void* aClientData);
+#endif

mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- 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
@@ -18,21 +18,24 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *   Chris Saari <saari@netscape.com>
  */
-#include "nsIModule.h"
+
+#include "nsGIFDecoder2.h"
+#include "nsIComponentManager.h"
 #include "nsIGenericFactory.h"
-#include "nsJARProtocolHandler.h"
+#include "nsISupports.h"
+#include "nsCOMPtr.h"
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIFDecoder2)
 
-static nsModuleComponentInfo components[] = 
+static nsModuleComponentInfo components[] =
 {
-    { "JAR Protocol Handler", 
-       NS_JARPROTOCOLHANDLER_CID,
-       NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "jar", 
-       nsJARProtocolHandler::Create
-    },
+  { "GIF Decoder",
+     NS_GIFDECODER2_CID,
+     "@mozilla.org/image/decoder;2?type=image/gif",
+     nsGIFDecoder2Constructor, },
 };
 
-NS_IMPL_NSGETMODULE(nsJarProtocolModule, components);
-
+NS_IMPL_NSGETMODULE("nsGIFModule2", components)
 

mozilla/modules/libpr0n/decoders/gif/win32.order

@@ -0,0 +1,18 @@
+?AddRef@nsGIFDecoder2@@UAGKXZ ; 2550
+?Release@nsGIFDecoder2@@UAGKXZ ; 2550
+?gif_write_ready@@YAEPAUgif_struct@@@Z ; 1624
+?ProcessData@nsGIFDecoder2@@QAGIPAEI@Z ; 1624
+?gif_write@@YAHPAUgif_struct@@PBEI@Z ; 1624
+?WriteFrom@nsGIFDecoder2@@UAGIPAVnsIInputStream@@IPAI@Z ; 1309
+?Close@nsGIFDecoder2@@UAGIXZ ; 1275
+??_GnsGIFDecoder2@@UAEPAXI@Z ; 1275
+??0nsGIFDecoder2@@QAE@XZ ; 1275
+??1nsGIFDecoder2@@UAE@XZ ; 1275
+?QueryInterface@nsGIFDecoder2@@UAGIABUnsID@@PAPAX@Z ; 1275
+?GIFInit@@YAHPAUgif_struct@@PAXP6AHXZP6AH1IIE@ZP6AH1H@ZP6AH1IIIIIPAU_GIF_RGB@@@ZP6AH1II@Z2222P6AH1PAE8HHHHEH@ZP6AH1@Z@Z ; 1275
+?Init@nsGIFDecoder2@@UAGIPAVimgIRequest@@@Z ; 1275
+?Flush@nsGIFDecoder2@@UAGIXZ ; 1275
+?gif_destroy@@YAXPAUgif_struct@@@Z ; 1275
+?gif_create@@YAHPAPAUgif_struct@@@Z ; 1275
+?il_BACat@@YAPADPAPADIPBDI@Z ; 698
+_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp

@@ -0,0 +1,378 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+
+#include "nsIconChannel.h"
+#include "nsIServiceManager.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsXPIDLString.h"
+#include "nsMimeTypes.h"
+#include "nsMemory.h"
+#include "nsIStringStream.h"
+#include "nsIURL.h"
+#include "nsNetUtil.h"
+#include "nsIMimeService.h"
+#include "nsCExternalHandlerService.h"
+#include "plstr.h"
+
+#include <Files.h>
+#include <QuickDraw.h>
+
+// nsIconChannel methods
+nsIconChannel::nsIconChannel()
+{
+  NS_INIT_REFCNT();
+  mStatus = NS_OK;
+}
+
+nsIconChannel::~nsIconChannel() 
+{}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
+                              nsIChannel, 
+                              nsIRequest)
+
+nsresult nsIconChannel::Init(nsIURI* uri)
+{
+  nsresult rv;
+  NS_ASSERTION(uri, "no uri");
+  mUrl = uri;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIRequest methods:
+
+NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
+{
+  NS_NOTREACHED("nsIconChannel::IsPending");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
+{
+  *status = mStatus;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
+{
+  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
+  nsresult rv = NS_ERROR_FAILURE;
+
+  mStatus = status;
+  return rv;
+}
+
+NS_IMETHODIMP nsIconChannel::Suspend(void)
+{
+  NS_NOTREACHED("nsIconChannel::Suspend");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::Resume(void)
+{
+  NS_NOTREACHED("nsIconChannel::Resume");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIChannel methods:
+
+NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
+{
+  *aURI = mOriginalURI ? mOriginalURI : mUrl;
+  NS_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
+{
+  mOriginalURI = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
+{
+  *aURI = mUrl;
+  NS_IF_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
+{
+  mUrl = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::Open(nsIInputStream **_retval)
+{
+  return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
+{
+  // get the file name from the url
+  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
+  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
+  mUrl->GetHost(getter_Copies(fileName));
+  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
+  if (url)
+    url->GetFileBaseName(getter_Copies(filePath));
+  nsresult rv = NS_OK;  
+  nsCOMPtr<nsIMIMEService> mimeService (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+  
+  // extract the extension out of the dummy file so we can look it up in the mime service.
+  char * chFileName = fileName.get(); // get the underlying buffer
+  char * fileExtension = PL_strrchr(chFileName, '.');
+  if (!fileExtension) return NS_ERROR_FAILURE; // no file extension to work from.
+  
+  // look the file extension up in the registry.
+  nsCOMPtr<nsIMIMEInfo> mimeInfo;
+  mimeService->GetFromExtension(fileExtension, getter_AddRefs(mimeInfo));
+  NS_ENSURE_TRUE(mimeInfo, NS_ERROR_FAILURE);
+  
+  // get the mac creator and file type for this mime object
+  PRUint32 macType;
+  PRUint32 macCreator;
+  
+  mimeInfo->GetMacType(&macType);
+  mimeInfo->GetMacCreator(&macCreator);
+  
+  // get a refernce to the desktop database  
+  DTPBRec 	pb;
+  OSErr err = noErr;
+  
+  memset(&pb, 0, sizeof(DTPBRec));
+  pb.ioCompletion = nil;
+  pb.ioVRefNum = 0; // default desktop volume
+  pb.ioNamePtr = nil;
+  err = PBDTGetPath(&pb);
+  if (err != noErr) return NS_ERROR_FAILURE;
+  
+  pb.ioFileCreator = macCreator;
+  pb.ioFileType = macType;
+  pb.ioCompletion = nil;
+  pb.ioTagInfo = 0;
+  
+  PRUint32 numPixelsInRow = 0;
+  if (filePath && !nsCRT::strcmp(filePath, "large"))
+  {
+    pb.ioDTReqCount = kLarge8BitIconSize;
+    pb.ioIconType = kLarge8BitIcon;
+    numPixelsInRow = 32;
+  }
+  else
+  {
+    pb.ioDTReqCount = kSmall8BitIconSize;
+    pb.ioIconType = kSmall8BitIcon;  
+    numPixelsInRow = 16;
+  }
+  
+  // allocate a buffer large enough to handle the icon
+  PRUint8 * bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
+  pb.ioDTBuffer = (Ptr) bitmapData;
+  
+  err = PBDTGetIcon(&pb, false);
+  if (err != noErr) return NS_ERROR_FAILURE; // unable to fetch the icon....
+  
+  nsCString iconBuffer;
+  iconBuffer.Assign((char) numPixelsInRow);
+  iconBuffer.Append((char) numPixelsInRow);
+  CTabHandle cTabHandle = GetCTable(72);
+  if (!cTabHandle) return NS_ERROR_FAILURE;
+  
+  HLock((Handle) cTabHandle);
+  CTabPtr colTable = *cTabHandle;
+  RGBColor rgbCol;
+  PRUint8 redValue, greenValue, blueValue;
+  
+  for (PRUint32 index = 0; index < pb.ioDTReqCount; index ++)
+  {
+
+  	// each byte in bitmapData needs to be converted from an 8 bit system color into 
+    // 24 bit RGB data which our special icon image decoder can understand.
+    ColorSpec colSpec =  colTable->ctTable[ bitmapData[index]];
+    rgbCol = colSpec.rgb;
+    
+    redValue = rgbCol.red & 0xff;
+    greenValue = rgbCol.green & 0xff;
+    blueValue = rgbCol.blue & 0xff;
+    
+    // for some reason the image code on the mac expects each RGB pixel value to be padded with a preceding byte.
+    // so add the padding here....
+    iconBuffer.Append((char) 0);
+    iconBuffer.Append((char) redValue);
+    iconBuffer.Append((char) greenValue);
+    iconBuffer.Append((char) blueValue);
+  }
+  
+  
+  HUnlock((Handle) cTabHandle);
+  DisposeCTable(cTabHandle);
+  nsMemory::Free(bitmapData);
+  
+  // now that the color bitmask is taken care of, we need to do the same thing again for the transparency
+  // bit mask....
+  if (filePath && !nsCRT::strcmp(filePath, "large"))
+  {
+    pb.ioDTReqCount = kLargeIconSize;
+    pb.ioIconType = kLargeIcon;
+  }
+  else
+  {
+    pb.ioDTReqCount = kSmallIconSize;
+    pb.ioIconType = kSmallIcon; 
+  }
+  
+  // allocate a buffer large enough to handle the icon
+  bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
+  pb.ioDTBuffer = (Ptr) bitmapData;
+  err = PBDTGetIcon(&pb, false);
+  PRUint32 index = pb.ioDTReqCount/2;
+  while (index < pb.ioDTReqCount)
+  {
+   iconBuffer.Append((char) bitmapData[index]);
+   iconBuffer.Append((char) bitmapData[index + 1]);
+   if (numPixelsInRow == 32)
+   {
+     iconBuffer.Append((char) bitmapData[index + 2]);
+     iconBuffer.Append((char) bitmapData[index + 3]);
+     index += 4;
+   }
+   else
+   {
+    iconBuffer.Append((char) 255); // 2 bytes of padding
+    iconBuffer.Append((char) 255);
+    index += 2;
+   }
+  }
+  
+  nsMemory::Free(bitmapData);
+  
+  // turn our nsString into a stream looking object...
+  aListener->OnStartRequest(this, ctxt);
+
+ // turn our string into a stream...
+ nsCOMPtr<nsISupports> streamSupports;
+ NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
+
+ nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
+ aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
+ aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
+{
+  *aLoadAttributes = mLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
+{
+  mLoadAttributes = aLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
+{
+  if (!aContentType) return NS_ERROR_NULL_POINTER;
+
+  *aContentType = nsCRT::strdup("image/icon");
+  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::SetContentType(const char *aContentType)
+{
+  //It doesn't make sense to set the content-type on this type
+  // of channel...
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
+{
+  *aContentLength = mContentLength;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
+{
+  NS_NOTREACHED("nsIconChannel::SetContentLength");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+  *aLoadGroup = mLoadGroup;
+  NS_IF_ADDREF(*aLoadGroup);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+  mLoadGroup = aLoadGroup;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
+{
+  *aOwner = mOwner.get();
+  NS_IF_ADDREF(*aOwner);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
+{
+  mOwner = aOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+  *aNotificationCallbacks = mCallbacks.get();
+  NS_IF_ADDREF(*aNotificationCallbacks);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+  mCallbacks = aNotificationCallbacks;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
+{
+  *aSecurityInfo = nsnull;
+  return NS_OK;
+}
+

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *  Scott MacGregor <mscott@netscape.com>
+ */
+
+#ifndef nsIconChannel_h___
+#define nsIconChannel_h___
+
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+#include "nsIChannel.h"
+#include "nsILoadGroup.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIURI.h"
+
+class nsIconChannel : public nsIChannel
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUEST
+  NS_DECL_NSICHANNEL
+
+  nsIconChannel();
+  virtual ~nsIconChannel();
+
+  nsresult Init(nsIURI* uri);
+
+protected:
+  nsCOMPtr<nsIURI> mUrl;
+  nsCOMPtr<nsIURI> mOriginalURI;
+  PRUint32         mLoadAttributes;
+  PRInt32          mContentLength;
+  nsCOMPtr<nsILoadGroup> mLoadGroup;
+  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
+  nsCOMPtr<nsISupports>  mOwner; 
+  nsresult mStatus;
+};
+
+#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/icon/makefile.win

@@ -0,0 +1,62 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#   Scott MacGregor <mscott@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+DIR=win
+
+MODULE			= imgicon
+LIBRARY_NAME	= imgicon
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsIconDecoder.obj \
+		.\$(OBJDIR)\nsIconModule.obj  \
+    .\$(OBJDIR)\nsIconProtocolHandler.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR)               \
+	$(DIST)\lib\xpcom.lib    \
+	$(DIST)\lib\gkgfxwin.lib \
+  $(DIST)\lib\imgiconwin_s.lib \
+	$(NULL)
+
+WIN_LIBS= shell32.lib
+
+INCS = $(INCS)                                         \
+        -I$(DEPTH)\dist\include                        \
+        -I$(DEPTH)\modules\libpr0n\decoders\icon\win   \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.cpp

@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Scott MacGregor <mscott@netscape.com>
+ *
+ */
+
+#include "nsIconDecoder.h"
+#include "nsIInputStream.h"
+#include "imgIContainer.h"
+#include "imgIContainerObserver.h"
+#include "nspr.h"
+#include "nsIComponentManager.h"
+#include "nsRect.h"
+
+NS_IMPL_THREADSAFE_ADDREF(nsIconDecoder);
+NS_IMPL_THREADSAFE_RELEASE(nsIconDecoder);
+
+NS_INTERFACE_MAP_BEGIN(nsIconDecoder)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIOutputStream)
+   NS_INTERFACE_MAP_ENTRY(nsIOutputStream)
+   NS_INTERFACE_MAP_ENTRY(imgIDecoder)
+NS_INTERFACE_MAP_END_THREADSAFE
+
+nsIconDecoder::nsIconDecoder()
+{
+  NS_INIT_ISUPPORTS();
+}
+
+nsIconDecoder::~nsIconDecoder()
+{ }
+
+
+/** imgIDecoder methods **/
+
+NS_IMETHODIMP nsIconDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+  if (!mFrame) return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+/** nsIOutputStream methods **/
+
+NS_IMETHODIMP nsIconDecoder::Close()
+{
+  if (mObserver) 
+  {
+    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
+    mObserver->OnStopContainer(nsnull, nsnull, mImage);
+    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconDecoder::Flush()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  nsresult rv;
+
+  char *buf = (char *)PR_Malloc(count);
+  if (!buf) return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
+ 
+  // read the data from the input stram...
+  PRUint32 readLen;
+  rv = inStr->Read(buf, count, &readLen);
+
+  char *data = buf;
+
+  if (NS_FAILED(rv)) return rv;
+
+  // since WriteFrom is only called once, go ahead and fire the on start notifications..
+
+  mObserver->OnStartDecode(nsnull, nsnull);
+  PRUint32 i = 0;
+  // Read size
+  PRInt32 w, h;
+  w = data[0];
+  h = data[1];
+
+  data += 2;
+
+  readLen -= i + 2;
+
+  mImage->Init(w, h, mObserver);
+  if (mObserver)
+    mObserver->OnStartContainer(nsnull, nsnull, mImage);
+
+  mFrame->Init(0, 0, w, h, gfxIFormats::RGB_A1);
+  mImage->AppendFrame(mFrame);
+  if (mObserver)
+    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
+  
+  PRUint32 bpr, abpr;
+  nscoord width, height;
+  mFrame->GetImageBytesPerRow(&bpr);
+  mFrame->GetAlphaBytesPerRow(&abpr);
+  mFrame->GetWidth(&width);
+  mFrame->GetHeight(&height);
+  
+  i = 0;
+  PRInt32 rownum = 0;  // XXX this better not have a decimal
+  
+  PRInt32 wroteLen = 0;
+
+  do 
+  {
+    PRUint8 *line = (PRUint8*)data + i*bpr;
+    mFrame->SetImageData(line, bpr, (rownum++)*bpr);
+
+    nsRect r(0, rownum, width, 1);
+    mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
+
+    wroteLen += bpr ;
+    i++;
+  } while(rownum < height);
+
+
+ // now we want to send in the alpha data...
+ for (rownum = 0; rownum < height; rownum ++)
+ {
+  PRUint8 * line = (PRUint8*) data + abpr * rownum + height*bpr;
+  mFrame->SetAlphaData(line, abpr, (rownum)*abpr);   
+ } 
+
+  PR_FREEIF(buf);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+#ifndef nsIconDecoder_h__
+#define nsIconDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "nsCOMPtr.h"
+
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+#define NS_ICONDECODER_CID                           \
+{ /* FFC08380-256C-11d5-9905-001083010E9B */         \
+     0xffc08380,                                     \
+     0x256c,                                         \
+     0x11d5,                                         \
+    { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b }   \
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+// The icon decoder is a decoder specifically tailored for loading icons 
+// from the OS. We've defined our own little format to represent these icons
+// and this decoder takes that format and converts it into 24-bit RGB with alpha channel
+// support. It was modeled a bit off the PPM decoder.
+//
+// Assumptions about the decoder:
+// (1) We receive ALL of the data from the icon channel in one OnDataAvailable call. We don't
+//     support multiple ODA calls yet.
+// (2) the format of the incoming data is as follows:
+//     The first two bytes contain the width and the height of the icon. 
+//     Followed by 3 bytes per pixel for the color bitmap row after row. (for heigh * width * 3 bytes)
+//     Followed by bit mask data (used for transparency on the alpha channel). 
+//
+//
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+class nsIconDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsIconDecoder();
+  virtual ~nsIconDecoder();
+
+private:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+};
+
+#endif // nsIconDecoder_h__

mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+#include "nsIGenericFactory.h"
+#include "nsIModule.h"
+
+#include "nsIconDecoder.h"
+#include "nsIconProtocolHandler.h"
+
+// objects that just require generic constructors
+/******************************************************************************
+ * Protocol CIDs
+ */
+#define NS_ICONPROTOCOL_CID   { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } } 
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconDecoder)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
+
+static nsModuleComponentInfo components[] =
+{
+  { "icon decoder",
+    NS_ICONDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/icon",
+    nsIconDecoderConstructor, },
+
+   { "Icon Protocol Handler",      
+      NS_ICONPROTOCOL_CID,
+      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "icon",
+      nsIconProtocolHandlerConstructor
+    }
+};
+
+NS_IMPL_NSGETMODULE("nsIconDecoderModule", components)
+

mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp

@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *  Scott MacGregor <mscott@netscape.com>
+ */
+
+#include "nsIconChannel.h"
+#include "nsIconProtocolHandler.h"
+#include "nsIURL.h"
+#include "nsCRT.h"
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+
+static NS_DEFINE_CID(kStandardURICID, NS_STANDARDURL_CID);
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsIconProtocolHandler::nsIconProtocolHandler() 
+{
+  NS_INIT_REFCNT();
+}
+
+nsIconProtocolHandler::~nsIconProtocolHandler() 
+{}
+
+NS_IMPL_ISUPPORTS2(nsIconProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference)
+
+    
+////////////////////////////////////////////////////////////////////////////////
+// nsIProtocolHandler methods:
+
+NS_IMETHODIMP nsIconProtocolHandler::GetScheme(char* *result) 
+{
+  *result = nsCRT::strdup("icon");
+  if (!*result) return NS_ERROR_OUT_OF_MEMORY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconProtocolHandler::GetDefaultPort(PRInt32 *result) 
+{
+  *result = 0;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **result) 
+{
+  nsresult rv;
+
+  // no concept of a relative icon url
+  NS_ASSERTION(!aBaseURI, "base url passed into icon protocol handler");
+  nsCOMPtr<nsIURI> url = do_CreateInstance(kStandardURICID, &rv);
+  if (NS_FAILED(rv)) return rv;
+  rv = url->SetSpec((char*)aSpec);
+  *result = url;
+  NS_IF_ADDREF(*result);
+  return rv;
+}
+
+NS_IMETHODIMP nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
+{
+  nsCOMPtr<nsIChannel> channel;
+  NS_NEWXPCOM(channel, nsIconChannel);
+
+  if (channel)
+    NS_STATIC_CAST(nsIconChannel*,NS_STATIC_CAST(nsIChannel*, channel))->Init(url);
+
+  *result = channel;
+  NS_IF_ADDREF(*result);
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.h

@@ -18,30 +18,26 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *   Scott MacGregor <mscott@netscape.com>
  */
 
-#ifndef _NSSOCKETPROVIDERSERVICE_H_
-#define _NSSOCKETPROVIDERSERVICE_H_
+#ifndef nsIconProtocolHandler_h___
+#define nsIconProtocolHandler_h___
 
-#include "nsISocketProviderService.h"
+#include "nsWeakReference.h"
+#include "nsIProtocolHandler.h"
 
-class nsSocketProviderService : public nsISocketProviderService
+class nsIconProtocolHandler : public nsIProtocolHandler, public nsSupportsWeakReference
 {
 public:
-  NS_DECL_ISUPPORTS
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIPROTOCOLHANDLER
 
-  NS_DECL_NSISOCKETPROVIDERSERVICE
-
-  // nsISocketProviderService methods:
-  nsSocketProviderService();
-  virtual ~nsSocketProviderService();
-
-  static NS_METHOD
-  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-  nsresult Init();
+    // nsIconProtocolHandler methods:
+    nsIconProtocolHandler();
+    virtual ~nsIconProtocolHandler();
 
 protected:
 };
 
-#endif /* _NSSOCKETPROVIDERSERVICE_H */
+#endif /* nsIconProtocolHandler_h___ */

mozilla/modules/libpr0n/decoders/icon/win/makefile.win

@@ -1,3 +1,5 @@
+#!gmake
+#
 # 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
@@ -16,27 +18,29 @@
 # Rights Reserved.
 #
 # Contributor(s): 
+#  Scott MacGregor <mscott@netscape.com>
 
-MODULE = necko
+DEPTH=..\..\..\..\..
+MODULE=imgicon
 
-DEPTH = ..\..\..
+LIBRARY_NAME=imgiconwin_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
-
-LIBRARY_NAME=neckodns_s
-
-CPP_OBJS =                           \
-        .\$(OBJDIR)\nsDnsService.obj \
-        $(NULL)
+CPP_OBJS=\
+        .\$(OBJDIR)\nsIconChannel.obj  	\
+         $(NULL)
 
 INCS = $(INCS)                  \
         -I$(DEPTH)\dist\include \
-        $(NULL)
+        -I..\       	         	\
+		$(NULL)
+
 
 include <$(DEPTH)\config\rules.mak>
 
 install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+         
 
 clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp

@@ -0,0 +1,377 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+
+#include "nsIconChannel.h"
+#include "nsIServiceManager.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsXPIDLString.h"
+#include "nsMimeTypes.h"
+#include "nsMemory.h"
+#include "nsIStringStream.h"
+#include "nsIURL.h"
+#include "nsNetUtil.h"
+
+// we need windows.h to read out registry information...
+#include <windows.h>
+#include <shellapi.h>
+
+// nsIconChannel methods
+nsIconChannel::nsIconChannel()
+{
+  NS_INIT_REFCNT();
+  mStatus = NS_OK;
+}
+
+nsIconChannel::~nsIconChannel() 
+{}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
+                              nsIChannel, 
+                              nsIRequest)
+
+nsresult nsIconChannel::Init(nsIURI* uri)
+{
+  nsresult rv;
+  NS_ASSERTION(uri, "no uri");
+  mUrl = uri;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIRequest methods:
+
+NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
+{
+  NS_NOTREACHED("nsIconChannel::IsPending");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
+{
+  *status = mStatus;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
+{
+  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
+  nsresult rv = NS_ERROR_FAILURE;
+
+  mStatus = status;
+  return rv;
+}
+
+NS_IMETHODIMP nsIconChannel::Suspend(void)
+{
+  NS_NOTREACHED("nsIconChannel::Suspend");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::Resume(void)
+{
+  NS_NOTREACHED("nsIconChannel::Resume");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIChannel methods:
+
+NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
+{
+  *aURI = mOriginalURI ? mOriginalURI : mUrl;
+  NS_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
+{
+  mOriginalURI = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
+{
+  *aURI = mUrl;
+  NS_IF_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
+{
+  mUrl = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::Open(nsIInputStream **_retval)
+{
+  return NS_ERROR_FAILURE;
+}
+
+void InvertRows(unsigned char * aInitialBuffer, PRUint32 sizeOfBuffer, PRUint32 numBytesPerRow)
+{
+  PRUint32 numRows = sizeOfBuffer / numBytesPerRow;
+  void * temporaryRowHolder = (void *) nsMemory::Alloc(numBytesPerRow);
+
+  PRUint32 currentRow = 0;
+  PRUint32 lastRow = (numRows - 1) * numBytesPerRow;
+  while (currentRow < lastRow)
+  {
+    // store the current row into a temporary buffer
+    nsCRT::memcpy(temporaryRowHolder, (void *) &aInitialBuffer[currentRow], numBytesPerRow);
+    nsCRT::memcpy((void *) &aInitialBuffer[currentRow], (void *)&aInitialBuffer[lastRow], numBytesPerRow);
+    nsCRT::memcpy((void *) &aInitialBuffer[lastRow], temporaryRowHolder, numBytesPerRow);
+    lastRow -= numBytesPerRow;
+    currentRow += numBytesPerRow;
+  }
+}
+
+NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
+{
+  // get the file name from the url
+  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
+  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
+  mUrl->GetHost(getter_Copies(fileName));
+  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
+  if (url)
+    url->GetFileBaseName(getter_Copies(filePath));
+
+  
+  // 1) get a hIcon for the file.
+  SHFILEINFO      sfi;
+  UINT infoFlags = SHGFI_USEFILEATTRIBUTES | SHGFI_ICON;
+  if (filePath && !nsCRT::strcmp(filePath, "large"))
+    infoFlags |= SHGFI_LARGEICON;
+  else // default to small
+    infoFlags |= SHGFI_SMALLICON;
+
+  LONG result= SHGetFileInfo(fileName, FILE_ATTRIBUTE_ARCHIVE, &sfi, sizeof(sfi), infoFlags);
+  if (result > 0 && sfi.hIcon)
+  {
+    // we got a handle to an icon. Now we want to get a bitmap for the icon using GetIconInfo....
+    ICONINFO pIconInfo;
+    result = GetIconInfo(sfi.hIcon, &pIconInfo);
+    if (result > 0)
+    {
+      // now we have the bit map we need to get info about the bitmap
+      BITMAPINFO pBitMapInfo;
+      BITMAPINFOHEADER pBitMapInfoHeader;
+      pBitMapInfo.bmiHeader.biBitCount = 0;
+      pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
+
+      HDC pDC = CreateCompatibleDC(NULL); // get a device context for the screen.
+      result = GetDIBits(pDC, pIconInfo.hbmColor, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
+      if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
+      {
+        // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
+        unsigned char * buffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
+        result = GetDIBits(pDC, pIconInfo.hbmColor, 0, pBitMapInfo.bmiHeader.biHeight, (void *) buffer, &pBitMapInfo, DIB_RGB_COLORS);
+        if (result > 0)
+        {
+          PRUint32 bytesPerPixel = pBitMapInfo.bmiHeader.biBitCount / 8;
+          InvertRows(buffer, pBitMapInfo.bmiHeader.biSizeImage, pBitMapInfo.bmiHeader.biWidth * bytesPerPixel);
+          // Convert our little icon buffer which is padded to 4 bytes per pixel into a nice 3 byte per pixel
+          // description.
+          nsCString iconBuffer;
+          iconBuffer.Assign((char) pBitMapInfo.bmiHeader.biWidth);
+          iconBuffer.Append((char) pBitMapInfo.bmiHeader.biHeight);
+          
+          PRInt32 index = 0;
+          if (pBitMapInfo.bmiHeader.biBitCount == 16)
+          {
+            PRUint8 redValue, greenValue, blueValue, partialGreen;
+            while (index < pBitMapInfo.bmiHeader.biSizeImage)
+            {                            
+              DWORD dst=(DWORD) buffer[index];
+              PRUint16 num = 0;
+              num = (PRUint8) buffer[index];
+              num <<= 8;
+              num |= (PRUint8) buffer[index+1];
+
+              //blueValue = (PRUint8)((*dst)&(0x1F));
+              //greenValue = (PRUint8)(((*dst)>>5)&(0x1F));
+              //redValue = (PRUint8)(((*dst)>>10)&(0x1F));
+
+              redValue = ((PRUint32) (((float)(num & 0x7c00) / 0x7c00) * 0xFF0000) & 0xFF0000)>> 16;
+              greenValue =  ((PRUint32)(((float)(num & 0x03E0) / 0x03E0) * 0x00FF00) & 0x00FF00)>> 8;
+              blueValue =  ((PRUint32)(((float)(num & 0x001F) / 0x001F) * 0x0000FF) & 0x0000FF);
+
+              // now we have the right RGB values...
+              iconBuffer.Append((char) redValue);
+              iconBuffer.Append((char) greenValue);
+              iconBuffer.Append((char) blueValue);
+              index += bytesPerPixel;
+            }
+          }
+          else
+          {
+            while (index <pBitMapInfo.bmiHeader.biSizeImage)
+            {
+              iconBuffer.Append((char) buffer[index]);
+              iconBuffer.Append((char) buffer[index+1]);
+              iconBuffer.Append((char) buffer[index+2]);
+              index += bytesPerPixel;
+            }
+          }
+
+          // now we need to tack on the alpha data...which is hbmMask
+          pBitMapInfo.bmiHeader.biBitCount = 0;
+          pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
+          result = GetDIBits(pDC, pIconInfo.hbmMask, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
+          if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
+          {
+            // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
+            unsigned char * maskBuffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
+            result = GetDIBits(pDC, pIconInfo.hbmMask, 0, pBitMapInfo.bmiHeader.biHeight, (void *) maskBuffer, &pBitMapInfo, DIB_RGB_COLORS);
+            if (result > 0)
+            {
+              InvertRows(maskBuffer, pBitMapInfo.bmiHeader.biSizeImage, 4);
+              index = 0;
+              // for some reason the bit mask on windows are flipped from the values we really want for transparency. 
+              // So complement each byte in the bit mask.
+              while (index < pBitMapInfo.bmiHeader.biSizeImage)
+              {
+                maskBuffer[index]^=255;
+                index += 1;
+              }
+              iconBuffer.Append((char *) maskBuffer, pBitMapInfo.bmiHeader.biSizeImage);
+            }
+
+            nsMemory::Free(maskBuffer);
+          } // if we have a mask buffer to apply
+
+          // turn our nsString into a stream looking object...
+          aListener->OnStartRequest(this, ctxt);
+
+          // turn our string into a stream...
+          nsCOMPtr<nsISupports> streamSupports;
+          NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
+
+          nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
+          aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
+          aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
+
+        } // if we got valid bits for the main bitmap mask
+        
+        nsMemory::Free(buffer);
+
+      }
+
+      DeleteDC(pDC);
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
+{
+  *aLoadAttributes = mLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
+{
+  mLoadAttributes = aLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
+{
+  if (!aContentType) return NS_ERROR_NULL_POINTER;
+
+  *aContentType = nsCRT::strdup("image/icon");
+  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::SetContentType(const char *aContentType)
+{
+  //It doesn't make sense to set the content-type on this type
+  // of channel...
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
+{
+  *aContentLength = mContentLength;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
+{
+  NS_NOTREACHED("nsIconChannel::SetContentLength");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+  *aLoadGroup = mLoadGroup;
+  NS_IF_ADDREF(*aLoadGroup);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+  mLoadGroup = aLoadGroup;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
+{
+  *aOwner = mOwner.get();
+  NS_IF_ADDREF(*aOwner);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
+{
+  mOwner = aOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+  *aNotificationCallbacks = mCallbacks.get();
+  NS_IF_ADDREF(*aNotificationCallbacks);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+  mCallbacks = aNotificationCallbacks;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
+{
+  *aSecurityInfo = nsnull;
+  return NS_OK;
+}
+

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *  Scott MacGregor <mscott@netscape.com>
+ */
+
+#ifndef nsIconChannel_h___
+#define nsIconChannel_h___
+
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+#include "nsIChannel.h"
+#include "nsILoadGroup.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIURI.h"
+
+class nsIconChannel : public nsIChannel
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUEST
+  NS_DECL_NSICHANNEL
+
+  nsIconChannel();
+  virtual ~nsIconChannel();
+
+  nsresult Init(nsIURI* uri);
+
+protected:
+  nsCOMPtr<nsIURI> mUrl;
+  nsCOMPtr<nsIURI> mOriginalURI;
+  PRUint32         mLoadAttributes;
+  PRInt32          mContentLength;
+  nsCOMPtr<nsILoadGroup> mLoadGroup;
+  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
+  nsCOMPtr<nsISupports>  mOwner; 
+  nsresult mStatus;
+};
+
+#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/jpeg/Makefile.in

@@ -3,20 +3,21 @@
 # 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/MPL/
-#
+# 
 # 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
 #
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Brian Ryner.
-# Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
-# All Rights Reserved.
-#
-# Contributor(s): 
-#  Brian Ryner <bryner@uiuc.edu>
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -25,18 +26,17 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-LIBRARY_NAME	= nkfinger_s
-REQUIRES	= xpcom string mimetype
+MODULE		= imgjpeg
+LIBRARY_NAME	= imgjpeg
+IS_COMPONENT	= 1
 
-CPPSRCS		= \
-		nsFingerHandler.cpp \
-		nsFingerChannel.cpp \
+REQUIRES	= xpcom string necko layout jpeg gfx2 imglib2
+
+CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
+
+EXTRA_DSO_LDOPTS = $(JPEG_LIBS) $(ZLIB_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
 include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/jpeg/makefile.win

@@ -0,0 +1,52 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imgjpeg
+LIBRARY_NAME	= imgjpeg
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsJPEGDecoder.obj \
+		.\$(OBJDIR)\nsJPEGFactory.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\jpeg3250.lib \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp

@@ -0,0 +1,829 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *
+ */
+
+#include "nsJPEGDecoder.h"
+
+#include "nsIInputStream.h"
+
+#include "nspr.h"
+
+#include "nsCRT.h"
+
+#include "nsIComponentManager.h"
+
+#include "imgIContainerObserver.h"
+
+
+#include "ImageLogging.h"
+
+
+NS_IMPL_ISUPPORTS2(nsJPEGDecoder, imgIDecoder, nsIOutputStream)
+
+
+#if defined(PR_LOGGING)
+PRLogModuleInfo *gJPEGlog = PR_NewLogModule("JPEGDecoder");
+#else
+#define gJPEGlog
+#endif
+
+
+
+void PR_CALLBACK init_source (j_decompress_ptr jd);
+boolean PR_CALLBACK fill_input_buffer (j_decompress_ptr jd);
+void PR_CALLBACK skip_input_data (j_decompress_ptr jd, long num_bytes);
+void PR_CALLBACK term_source (j_decompress_ptr jd);
+void PR_CALLBACK my_error_exit (j_common_ptr cinfo);
+
+/* Normal JFIF markers can't have more bytes than this. */
+#define MAX_JPEG_MARKER_LENGTH  (((PRUint32)1 << 16) - 1)
+
+
+/* Possible states for JPEG source manager */
+enum data_source_state {
+    READING_BACK = 0, /* Must be zero for init purposes */
+    READING_NEW
+};
+
+/*
+ *  Implementation of a JPEG src object that understands our state machine
+ */
+typedef struct {
+  /* public fields; must be first in this struct! */
+  struct jpeg_source_mgr pub;
+
+  nsJPEGDecoder *decoder;
+
+} decoder_source_mgr;
+
+
+nsJPEGDecoder::nsJPEGDecoder()
+{
+  NS_INIT_ISUPPORTS();
+
+  mState = JPEG_HEADER;
+  mFillState = READING_BACK;
+
+  mSamples = nsnull;
+  mSamples3 = nsnull;
+  mRGBPadRow = nsnull;
+  mRGBPadRowLength = 0;
+
+  mBytesToSkip = 0;
+  
+  memset(&mInfo, 0, sizeof(jpeg_decompress_struct));
+
+  mCompletedPasses = 0;
+
+  mBuffer = nsnull;
+  mBufferLen = mBufferSize = 0;
+
+  mBackBuffer = nsnull;
+  mBackBufferLen = mBackBufferSize = mBackBufferUnreadLen = 0;
+
+}
+
+nsJPEGDecoder::~nsJPEGDecoder()
+{
+  if (mBuffer)
+    PR_Free(mBuffer);
+  if (mBackBuffer)
+    PR_Free(mBackBuffer);
+  if (mRGBPadRow)
+    PR_Free(mRGBPadRow);
+}
+
+
+/** imgIDecoder methods **/
+
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsJPEGDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+  mObserver = do_QueryInterface(mRequest);
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  /* We set up the normal JPEG error routines, then override error_exit. */
+  mInfo.err = jpeg_std_error(&mErr.pub);
+  /*   mInfo.err = jpeg_std_error(&mErr.pub); */
+  mErr.pub.error_exit = my_error_exit;
+  /* Establish the setjmp return context for my_error_exit to use. */
+  if (setjmp(mErr.setjmp_buffer)) {
+    /* If we get here, the JPEG code has signaled an error.
+     * We need to clean up the JPEG object, close the input file, and return.
+     */
+    return NS_ERROR_FAILURE;
+  }
+
+  /* Step 1: allocate and initialize JPEG decompression object */
+  jpeg_create_decompress(&mInfo);
+  
+  decoder_source_mgr *src;
+  if (mInfo.src == NULL) {
+    //mInfo.src = PR_NEWZAP(decoder_source_mgr);
+    src = PR_NEWZAP(decoder_source_mgr);
+    if (!src) {
+      return PR_FALSE;
+    }
+    mInfo.src = (struct jpeg_source_mgr *) src;
+  }
+
+  /* Step 2: specify data source (eg, a file) */
+
+  /* Setup callback functions. */
+  src->pub.init_source = init_source;
+  src->pub.fill_input_buffer = fill_input_buffer;
+  src->pub.skip_input_data = skip_input_data;
+  src->pub.resync_to_restart = jpeg_resync_to_restart;
+  src->pub.term_source = term_source;
+
+  src->decoder = this;
+
+
+
+  return NS_OK;
+}
+
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsJPEGDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+
+
+
+
+
+/** nsIOutputStream methods **/
+
+/* void close (); */
+NS_IMETHODIMP nsJPEGDecoder::Close()
+{
+  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+         ("[this=%p] nsJPEGDecoder::Close\n", this));
+
+  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
+    NS_WARNING("Never finished decoding the JPEG.");
+
+  /* Step 8: Release JPEG decompression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_decompress(&mInfo);
+
+  return NS_OK;
+}
+
+/* void flush (); */
+NS_IMETHODIMP nsJPEGDecoder::Flush()
+{
+  LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::Flush");
+
+  PRUint32 ret;
+  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
+    return this->WriteFrom(nsnull, 0, &ret);
+
+  return NS_OK;
+}
+
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsJPEGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  LOG_SCOPE_WITH_PARAM(gJPEGlog, "nsJPEGDecoder::WriteFrom", "count", count);
+
+  /* We use our private extension JPEG error handler.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  // XXX above what is this?
+
+
+  if (inStr) {
+    if (!mBuffer) {
+      mBuffer = (JOCTET *)PR_Malloc(count);
+      mBufferSize = count;
+    } else if (count > mBufferSize) {
+      mBuffer = (JOCTET *)PR_Realloc(mBuffer, count);
+      mBufferSize = count;
+    }
+
+    nsresult rv = inStr->Read((char*)mBuffer, count, &mBufferLen);
+    *_retval = mBufferLen;
+
+    //nsresult rv = mOutStream->WriteFrom(inStr, count, _retval);
+
+    NS_ASSERTION(NS_SUCCEEDED(rv), "nsJPEGDecoder::WriteFrom -- mOutStream->WriteFrom failed");
+  }
+  // else no input stream.. Flush() ?
+
+
+  nsresult error_code = NS_ERROR_FAILURE;
+  /* Return here if there is a fatal error. */
+  if ((error_code = setjmp(mErr.setjmp_buffer)) != 0) {
+    return error_code;
+  }
+
+
+  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+         ("[this=%p] nsJPEGDecoder::WriteFrom -- processing JPEG data\n", this));
+
+  decoder_source_mgr *src = NS_REINTERPRET_CAST(decoder_source_mgr *, mInfo.src);
+
+  switch (mState) {
+  case JPEG_HEADER:
+  {
+    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_HEADER case");
+
+    /* Step 3: read file parameters with jpeg_read_header() */
+    if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED)
+      return NS_OK; /* I/O suspension */
+
+    /*
+     * Don't allocate a giant and superfluous memory buffer
+     * when the image is a sequential JPEG.
+     */
+    mInfo.buffered_image = jpeg_has_multiple_scans(&mInfo);
+
+    /* Used to set up image size so arrays can be allocated */
+    jpeg_calc_output_dimensions(&mInfo);
+
+    mObserver->OnStartDecode(nsnull, nsnull);
+
+    mImage->Init(mInfo.image_width, mInfo.image_height, mObserver);
+    mObserver->OnStartContainer(nsnull, nsnull, mImage);
+
+    mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+    gfx_format format;
+#ifdef XP_PC
+    format = gfxIFormats::BGR;
+#else
+    format = gfxIFormats::RGB;
+#endif
+    mFrame->Init(0, 0, mInfo.image_width, mInfo.image_height, format);
+    mImage->AppendFrame(mFrame);
+    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
+
+
+    /*
+     * Make a one-row-high sample array that will go away
+     * when done with image. Always make it big enough to
+     * hold an RGB row.  Since this uses the IJG memory
+     * manager, it must be allocated before the call to
+     * jpeg_start_compress().
+     */
+    int row_stride;
+
+    if(mInfo.output_components == 1)
+      row_stride = mInfo.output_width;
+    else
+      row_stride = mInfo.output_width * 4; // use 4 instead of mInfo.output_components
+                                           // so we don't have to fuss with byte alignment.
+                                           // Mac wants 4 anyways.
+
+    mSamples = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
+                                           JPOOL_IMAGE,
+                                           row_stride, 1);
+
+#if defined(XP_PC) || defined(XP_MAC)
+    // allocate buffer to do byte flipping if needed
+    if (mInfo.output_components == 3) {
+      mRGBPadRow = (PRUint8*) PR_MALLOC(row_stride);
+      mRGBPadRowLength = row_stride;
+      memset(mRGBPadRow, 0, mRGBPadRowLength);
+    }
+#endif
+
+    /* Allocate RGB buffer for conversion from greyscale. */
+    if (mInfo.output_components != 3) {
+      row_stride = mInfo.output_width * 4;
+      mSamples3 = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
+                                              JPOOL_IMAGE,
+                                              row_stride, 1);
+    }
+
+    mState = JPEG_START_DECOMPRESS;
+  }
+  case JPEG_START_DECOMPRESS:
+  {
+    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_START_DECOMPRESS case");
+    /* Step 4: set parameters for decompression */
+
+    /* FIXME -- Should reset dct_method and dither mode
+     * for final pass of progressive JPEG
+     */
+    mInfo.dct_method = JDCT_FASTEST;
+    mInfo.dither_mode = JDITHER_ORDERED;
+    mInfo.do_fancy_upsampling = FALSE;
+    mInfo.enable_2pass_quant = FALSE;
+    mInfo.do_block_smoothing = TRUE;
+
+    /* Step 5: Start decompressor */
+    if (jpeg_start_decompress(&mInfo) == FALSE)
+      return NS_OK; /* I/O suspension */
+
+    /* If this is a progressive JPEG ... */
+    if (mInfo.buffered_image) {
+      mState = JPEG_DECOMPRESS_PROGRESSIVE;
+    } else {
+      mState = JPEG_DECOMPRESS_SEQUENTIAL;
+    }
+
+  }
+
+  case JPEG_DECOMPRESS_SEQUENTIAL:
+  {
+    if (mState == JPEG_DECOMPRESS_SEQUENTIAL)
+    {
+      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_SEQUENTIAL case");
+
+      if (OutputScanlines(-1) == PR_FALSE)
+        return NS_OK; /* I/O suspension */
+
+      /* If we've completed image output ... */
+      NS_ASSERTION(mInfo.output_scanline == mInfo.output_height, "We didn't process all of the data!");
+      mState = JPEG_DONE;    
+    }
+  }
+
+
+  case JPEG_DECOMPRESS_PROGRESSIVE:
+  {
+    if (mState == JPEG_DECOMPRESS_PROGRESSIVE)
+    {
+      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_PROGRESSIVE case");
+
+      int status;
+      do {
+        status = jpeg_consume_input(&mInfo);
+      } while (!((status == JPEG_SUSPENDED) ||
+                 (status == JPEG_REACHED_EOI)));
+
+      switch (status) {
+        case JPEG_REACHED_EOI:
+          // End of image
+          mState = JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT;
+          break;
+        case JPEG_SUSPENDED:
+          PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+                 ("[this=%p] nsJPEGDecoder::WriteFrom -- suspending\n", this));
+
+          return NS_OK; /* I/O suspension */
+        default:
+          printf("got someo other state!?\n");
+      }
+    }
+  }
+
+  case JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT:
+  {
+    if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
+    {
+      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT case");
+
+      // XXX progressive? ;)
+      // not really progressive according to the state machine... -saari
+      jpeg_start_output(&mInfo, mInfo.input_scan_number);
+      if (OutputScanlines(-1) == PR_FALSE)
+        return NS_OK; /* I/O suspension */
+      jpeg_finish_output(&mInfo);
+      mState = JPEG_DONE;
+    }
+  }
+
+  case JPEG_DONE:
+  {
+    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_DONE case");
+
+    /* Step 7: Finish decompression */
+
+    if (jpeg_finish_decompress(&mInfo) == FALSE)
+      return NS_OK; /* I/O suspension */
+
+    mState = JPEG_SINK_NON_JPEG_TRAILER;
+
+    /* we're done dude */
+    break;
+  }
+  case JPEG_SINK_NON_JPEG_TRAILER:
+    PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+           ("[this=%p] nsJPEGDecoder::WriteFrom -- entering JPEG_SINK_NON_JPEG_TRAILER case\n", this));
+
+    break;
+  }
+
+  return NS_OK;
+}
+
+
+int
+nsJPEGDecoder::OutputScanlines(int num_scanlines)
+{
+  int pass = 0;
+  
+  if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
+      pass = -1;
+  else
+      pass = mCompletedPasses + 1;
+
+  while ((mInfo.output_scanline < mInfo.output_height) && num_scanlines--) {
+      JSAMPROW samples;
+      
+      /* Request one scanline.  Returns 0 or 1 scanlines. */
+      int ns = jpeg_read_scanlines(&mInfo, mSamples, 1);
+      
+      if (ns != 1) {
+        return PR_FALSE; /* suspend */
+      }
+
+      /* If grayscale image ... */
+      if (mInfo.output_components == 1) {
+        JSAMPLE j;
+        JSAMPLE *j1 = mSamples[0];
+        const JSAMPLE *j1end = j1 + mInfo.output_width;
+        JSAMPLE *j3 = mSamples3[0];
+
+        /* Convert from grayscale to RGB. */
+        while (j1 < j1end) {
+#ifdef XP_MAC
+          j = *j1++;
+          j3[0] = 0;
+          j3[1] = j;
+          j3[2] = j;
+          j3[3] = j;
+          j3 += 4;
+#else
+          j = *j1++;
+          j3[0] = j;
+          j3[1] = j;
+          j3[2] = j;
+          j3 += 3;
+#endif
+        }
+        samples = mSamples3[0];
+      } else {
+        /* 24-bit color image */
+#ifdef XP_PC
+        memset(mRGBPadRow, 0, mInfo.output_width * 4);
+        PRUint8 *ptrOutputBuf = mRGBPadRow;
+
+        JSAMPLE *j1 = mSamples[0];
+        for (PRUint32 i=0;i<mInfo.output_width;++i) {
+          ptrOutputBuf[2] = *j1++;
+          ptrOutputBuf[1] = *j1++;
+          ptrOutputBuf[0] = *j1++;
+          ptrOutputBuf += 3;
+        }
+
+        samples = mRGBPadRow;
+#else
+#ifdef XP_MAC
+        memset(mRGBPadRow, 0, mInfo.output_width * 4);
+        PRUint8 *ptrOutputBuf = mRGBPadRow;
+
+        JSAMPLE *j1 = mSamples[0];
+        for (PRUint32 i=0;i<mInfo.output_width;++i) {
+          ptrOutputBuf[0] = 0;
+          ptrOutputBuf[1] = *j1++;
+          ptrOutputBuf[2] = *j1++;
+          ptrOutputBuf[3] = *j1++;
+          ptrOutputBuf += 4;
+        }
+
+        samples = mRGBPadRow;
+#else
+        samples = mSamples[0];
+#endif
+#endif
+      }
+
+      PRUint32 bpr;
+      mFrame->GetImageBytesPerRow(&bpr);
+      mFrame->SetImageData(
+        samples,             // data
+        bpr,                 // length
+        (mInfo.output_scanline-1) * bpr); // offset
+
+      nsRect r(0, mInfo.output_scanline, mInfo.output_width, 1);
+      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
+
+  }
+
+  return PR_TRUE;
+}
+
+
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsJPEGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsJPEGDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsJPEGDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsJPEGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsJPEGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+
+
+/* Override the standard error method in the IJG JPEG decoder code. */
+void PR_CALLBACK
+my_error_exit (j_common_ptr cinfo)
+{
+  nsresult error_code = NS_ERROR_FAILURE;
+  decoder_error_mgr *err = (decoder_error_mgr *) cinfo->err;
+
+#if 0
+#ifdef DEBUG
+/*ptn fix later */
+  if (il_debug >= 1) {
+      char buffer[JMSG_LENGTH_MAX];
+
+      /* Create the message */
+      (*cinfo->err->format_message) (cinfo, buffer);
+
+      ILTRACE(1,("%s\n", buffer));
+  }
+#endif
+
+
+  /* Convert error to a browser error code */
+  if (cinfo->err->msg_code == JERR_OUT_OF_MEMORY)
+      error_code = MK_OUT_OF_MEMORY;
+  else
+      error_code = MK_IMAGE_LOSSAGE;
+#endif
+
+  char buffer[JMSG_LENGTH_MAX];
+
+  /* Create the message */
+  (*cinfo->err->format_message) (cinfo, buffer);
+
+  fprintf(stderr, "my_error_exit()\n%s\n", buffer);
+
+  /* Return control to the setjmp point. */
+  longjmp(err->setjmp_buffer, error_code);
+}
+
+/******************************************************************************/
+/*-----------------------------------------------------------------------------
+ * This is the callback routine from the IJG JPEG library used to supply new
+ * data to the decompressor when its input buffer is exhausted.  It juggles
+ * multiple buffers in an attempt to avoid unnecessary copying of input data.
+ *
+ * (A simpler scheme is possible: It's much easier to use only a single
+ * buffer; when fill_input_buffer() is called, move any unconsumed data
+ * (beyond the current pointer/count) down to the beginning of this buffer and
+ * then load new data into the remaining buffer space.  This approach requires
+ * a little more data copying but is far easier to get right.)
+ *
+ * At any one time, the JPEG decompressor is either reading from the necko
+ * input buffer, which is volatile across top-level calls to the IJG library,
+ * or the "backtrack" buffer.  The backtrack buffer contains the remaining
+ * unconsumed data from the necko buffer after parsing was suspended due
+ * to insufficient data in some previous call to the IJG library.
+ *
+ * When suspending, the decompressor will back up to a convenient restart
+ * point (typically the start of the current MCU). The variables
+ * next_input_byte & bytes_in_buffer indicate where the restart point will be
+ * if the current call returns FALSE.  Data beyond this point must be
+ * rescanned after resumption, so it must be preserved in case the decompressor
+ * decides to backtrack.
+ *
+ * Returns:
+ *  TRUE if additional data is available, FALSE if no data present and
+ *   the JPEG library should therefore suspend processing of input stream
+ *---------------------------------------------------------------------------*/
+
+/******************************************************************************/
+/* data source manager method 
+/******************************************************************************/
+
+
+/******************************************************************************/
+/* data source manager method 
+	Initialize source.  This is called by jpeg_read_header() before any
+	data is actually read.  May leave
+	bytes_in_buffer set to 0 (in which case a fill_input_buffer() call
+	will occur immediately).
+*/
+void PR_CALLBACK
+init_source (j_decompress_ptr jd)
+{
+}
+
+/******************************************************************************/
+/* data source manager method
+	Skip num_bytes worth of data.  The buffer pointer and count should
+	be advanced over num_bytes input bytes, refilling the buffer as
+	needed.  This is used to skip over a potentially large amount of
+	uninteresting data (such as an APPn marker).  In some applications
+	it may be possible to optimize away the reading of the skipped data,
+	but it's not clear that being smart is worth much trouble; large
+	skips are uncommon.  bytes_in_buffer may be zero on return.
+	A zero or negative skip count should be treated as a no-op.
+*/
+void PR_CALLBACK
+skip_input_data (j_decompress_ptr jd, long num_bytes)
+{
+  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
+
+  if (num_bytes > (long)src->pub.bytes_in_buffer) {
+    /*
+     * Can't skip it all right now until we get more data from
+     * network stream. Set things up so that fill_input_buffer
+     * will skip remaining amount.
+     */
+    src->decoder->mBytesToSkip = (size_t)num_bytes - src->pub.bytes_in_buffer;
+    src->pub.next_input_byte += src->pub.bytes_in_buffer;
+    src->pub.bytes_in_buffer = 0;
+
+  } else {
+    /* Simple case. Just advance buffer pointer */
+
+    src->pub.bytes_in_buffer -= (size_t)num_bytes;
+    src->pub.next_input_byte += num_bytes;
+  }
+}
+
+
+/******************************************************************************/
+/* data source manager method
+	This is called whenever bytes_in_buffer has reached zero and more
+	data is wanted.  In typical applications, it should read fresh data
+	into the buffer (ignoring the current state of next_input_byte and
+	bytes_in_buffer), reset the pointer & count to the start of the
+	buffer, and return TRUE indicating that the buffer has been reloaded.
+	It is not necessary to fill the buffer entirely, only to obtain at
+	least one more byte.  bytes_in_buffer MUST be set to a positive value
+	if TRUE is returned.  A FALSE return should only be used when I/O
+	suspension is desired.
+*/
+boolean PR_CALLBACK
+fill_input_buffer (j_decompress_ptr jd)
+{
+  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
+
+  unsigned char *new_buffer = (unsigned char *)src->decoder->mBuffer;
+  PRUint32 new_buflen = src->decoder->mBufferLen;
+  PRUint32 bytesToSkip = src->decoder->mBytesToSkip;
+
+  switch(src->decoder->mFillState) {
+  case READING_BACK:
+    {
+      if (!new_buffer || new_buflen == 0)
+        return PR_FALSE; /* suspend */
+
+      src->decoder->mBufferLen = 0;
+
+      if (bytesToSkip != 0) {
+        if (bytesToSkip < new_buflen) {
+          /* All done skipping bytes; Return what's left. */
+          new_buffer += bytesToSkip;
+          new_buflen -= bytesToSkip;
+          src->decoder->mBytesToSkip = 0;
+        } else {
+          /* Still need to skip some more data in the future */
+          src->decoder->mBytesToSkip -= (size_t)new_buflen;
+          return PR_FALSE; /* suspend */
+        }
+      }
+
+      src->decoder->mBackBufferUnreadLen = src->pub.bytes_in_buffer;
+
+      src->pub.next_input_byte = new_buffer;
+      src->pub.bytes_in_buffer = (size_t)new_buflen;
+      src->decoder->mFillState = READING_NEW;
+
+      return PR_TRUE;
+    }
+    break;
+
+  case READING_NEW:
+    {
+      if (src->pub.next_input_byte != src->decoder->mBuffer) {
+        /* Backtrack data has been permanently consumed. */
+        src->decoder->mBackBufferUnreadLen = 0;
+        src->decoder->mBackBufferLen = 0;
+      }
+
+      /* Save remainder of netlib buffer in backtrack buffer */
+      PRUint32 new_backtrack_buflen = src->pub.bytes_in_buffer + src->decoder->mBackBufferLen;
+
+
+      /* Make sure backtrack buffer is big enough to hold new data. */
+      if (src->decoder->mBackBufferSize < new_backtrack_buflen) {
+
+        /* Round up to multiple of 16 bytes. */
+        PRUint32 roundup_buflen = ((new_backtrack_buflen + 15) >> 4) << 4;
+        if (src->decoder->mBackBufferSize) {
+            src->decoder->mBackBuffer =
+          (JOCTET *)PR_REALLOC(src->decoder->mBackBuffer, roundup_buflen);
+        } else {
+          src->decoder->mBackBuffer = (JOCTET*)PR_MALLOC(roundup_buflen);
+        }
+
+        /* Check for OOM */
+        if (!src->decoder->mBackBuffer) {
+#if 0
+          j_common_ptr cinfo = (j_common_ptr)(&src->js->jd);
+          cinfo->err->msg_code = JERR_OUT_OF_MEMORY;
+          my_error_exit(cinfo);
+#endif
+        }
+          
+        src->decoder->mBackBufferSize = (size_t)roundup_buflen;
+
+        /* Check for malformed MARKER segment lengths. */
+        if (new_backtrack_buflen > MAX_JPEG_MARKER_LENGTH) {
+          my_error_exit((j_common_ptr)(&src->decoder->mInfo));
+        }
+      }
+
+
+      /* Copy remainder of netlib buffer into backtrack buffer. */
+      nsCRT::memmove(src->decoder->mBackBuffer + src->decoder->mBackBufferLen,
+                     src->pub.next_input_byte,
+                     src->pub.bytes_in_buffer);
+
+
+      /* Point to start of data to be rescanned. */
+      src->pub.next_input_byte = src->decoder->mBackBuffer + src->decoder->mBackBufferLen - src->decoder->mBackBufferUnreadLen;
+      src->pub.bytes_in_buffer += src->decoder->mBackBufferUnreadLen;
+      src->decoder->mBackBufferLen = (size_t)new_backtrack_buflen;
+    
+      src->decoder->mFillState = READING_BACK;
+
+      return PR_FALSE;
+    }
+    break;
+  }
+
+  return PR_FALSE;
+}
+
+/******************************************************************************/
+/* data source manager method */
+/*
+ * Terminate source --- called by jpeg_finish_decompress() after all
+ * data has been read to clean up JPEG source manager. NOT called by 
+ * jpeg_abort() or jpeg_destroy().
+ */
+void PR_CALLBACK
+term_source (j_decompress_ptr jd)
+{
+  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
+
+  if (src->decoder->mObserver) {
+    src->decoder->mObserver->OnStopFrame(nsnull, nsnull, src->decoder->mFrame);
+    src->decoder->mObserver->OnStopContainer(nsnull, nsnull, src->decoder->mImage);
+    src->decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+
+    /* No work necessary here */
+}

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h

@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsJPEGDecoder_h__
+#define nsJPEGDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "nsCOMPtr.h"
+
+#include "imgIContainer.h"
+#include "gfxIImageFrame.h"
+#include "imgIDecoderObserver.h"
+#include "imgIRequest.h"
+#include "nsIInputStream.h"
+#include "nsIPipe.h"
+
+extern "C" {
+#include "jpeglib.h"
+}
+
+#include <setjmp.h>
+
+#define NS_JPEGDECODER_CID \
+{ /* 5871a422-1dd2-11b2-ab3f-e2e56be5da9c */         \
+     0x5871a422,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0xab, 0x3f, 0xe2, 0xe5, 0x6b, 0xe5, 0xda, 0x9c} \
+}
+
+typedef struct {
+    struct jpeg_error_mgr pub;  /* "public" fields for IJG library*/
+    jmp_buf setjmp_buffer;      /* For handling catastropic errors */
+} decoder_error_mgr;
+
+
+typedef enum {
+    JPEG_HEADER,                          /* Reading JFIF headers */
+    JPEG_START_DECOMPRESS,
+    JPEG_DECOMPRESS_PROGRESSIVE,          /* Output progressive pixels */
+    JPEG_DECOMPRESS_SEQUENTIAL,           /* Output sequential pixels */
+    JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT,
+    JPEG_DONE,
+    JPEG_SINK_NON_JPEG_TRAILER,          /* Some image files have a */
+                                         /* non-JPEG trailer */
+    JPEG_ERROR    
+} jstate;
+
+class nsJPEGDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsJPEGDecoder();
+  virtual ~nsJPEGDecoder();
+
+  PRBool FillInput(j_decompress_ptr jd);
+
+  PRUint32 mBytesToSkip;
+
+protected:
+  int OutputScanlines(int num_scanlines);
+
+public:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+
+  nsCOMPtr<imgIDecoderObserver> mObserver;
+
+  struct jpeg_decompress_struct mInfo;
+  decoder_error_mgr mErr;
+  jstate mState;
+
+  JSAMPARRAY mSamples;
+  JSAMPARRAY mSamples3;
+  PRUint8*   mRGBPadRow;
+  PRUint32   mRGBPadRowLength;
+
+  PRInt32 mCompletedPasses;
+  PRInt32 mPasses;
+
+  int mFillState;
+
+  JOCTET *mBuffer;
+  PRUint32 mBufferLen;  // amount of data currently in mBuffer
+  PRUint32 mBufferSize; // size in bytes what mBuffer was created with
+
+  JOCTET *mBackBuffer;
+  PRUint32 mBackBufferLen; // Offset of end of active backtrack data
+  PRUint32 mBackBufferSize; // size in bytes what mBackBuffer was created with
+  PRUint32 mBackBufferUnreadLen; // amount of data currently in mBackBuffer
+
+
+
+};
+
+#endif // nsJPEGDecoder_h__

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp

@@ -1,35 +1,42 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Mozilla 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/MPL/
- *
+ * 
  * 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
+ * Copyright (C) 2001 Netscape Communications Corporation. All
  * Rights Reserved.
- *
+ * 
  * Contributor(s): 
- *  Patrick C. Beard <beard@netscape.com>
+ *   Stuart Parmenter <pavlov@netscape.com>
  */
 
 #include "nsIGenericFactory.h"
-#include "nsThemeHandler.h"
+#include "nsIModule.h"
 
-static nsModuleComponentInfo gResComponents[] = {
-    { "The Theme Protocol Handler", 
-      NS_THEMEHANDLER_CID,
-      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "theme",
-      nsThemeHandler::Create
-    }
+#include "nsJPEGDecoder.h"
+
+// objects that just require generic constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsJPEGDecoder)
+
+static nsModuleComponentInfo components[] =
+{
+  { "ppm decoder",
+    NS_JPEGDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/jpeg",
+    nsJPEGDecoderConstructor, },
 };
 
-NS_IMPL_NSGETMODULE(theme, gResComponents)
+NS_IMPL_NSGETMODULE("nsJPEGDecoderModule", components)
+

mozilla/modules/libpr0n/decoders/jpeg/win32.order

@@ -0,0 +1,16 @@
+?Release@nsJPEGDecoder@@UAGKXZ ; 172
+?AddRef@nsJPEGDecoder@@UAGKXZ ; 172
+?fill_input_buffer@@YAEPAUjpeg_decompress_struct@@@Z ; 126
+?skip_input_data@@YAXPAUjpeg_decompress_struct@@J@Z ; 109
+?WriteFrom@nsJPEGDecoder@@UAGIPAVnsIInputStream@@IPAI@Z ; 106
+?OutputScanlines@nsJPEGDecoder@@IAEHH@Z ; 93
+?init_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
+??1nsJPEGDecoder@@UAE@XZ ; 86
+?Close@nsJPEGDecoder@@UAGIXZ ; 86
+?term_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
+?Init@nsJPEGDecoder@@UAGIPAVimgIRequest@@@Z ; 86
+??0nsJPEGDecoder@@QAE@XZ ; 86
+?Flush@nsJPEGDecoder@@UAGIXZ ; 86
+?QueryInterface@nsJPEGDecoder@@UAGIABUnsID@@PAPAX@Z ; 86
+??_EnsJPEGDecoder@@UAEPAXI@Z ; 86
+_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/makefile.win

@@ -1,32 +1,26 @@
-#!gmake
 #
 # The contents of this file are subject to the Mozilla 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/MPL/
-#
+# 
 # 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 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
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
 # Rights Reserved.
+# 
+# Contributor(s):
 #
-# Contributor(s): 
-#  Chak Nanga <chak@netscape.com>
 
-DEPTH = ..\..\..
+DEPTH=..\..\..
 
-MODULE = necko
+DIRS = ppm gif png jpeg
 
-DIRS=      \
-    public \
-    src    \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
+!include $(DEPTH)\config\rules.mak

mozilla/modules/libpr0n/decoders/png/Makefile.in

@@ -3,20 +3,21 @@
 # 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/MPL/
-#
+# 
 # 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
 #
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Brian Ryner.
-# Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
-# All Rights Reserved.
-#
-# Contributor(s): 
-#  Brian Ryner <bryner@uiuc.edu>
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -25,18 +26,17 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-LIBRARY_NAME	= nkfinger_s
-REQUIRES	= xpcom string mimetype
+MODULE		= imgpng
+LIBRARY_NAME	= imgpng
+IS_COMPONENT	= 1
 
-CPPSRCS		= \
-		nsFingerHandler.cpp \
-		nsFingerChannel.cpp \
+REQUIRES	= xpcom necko layout png gfx2 imglib2
+
+CPPSRCS		= nsPNGDecoder.cpp nsPNGFactory.cpp
+
+EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
 include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/png/makefile.win

@@ -0,0 +1,53 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imgpng
+LIBRARY_NAME	= imgpng
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsPNGDecoder.obj \
+		.\$(OBJDIR)\nsPNGFactory.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\png.lib \
+	$(DIST)\lib\zlib.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp

@@ -0,0 +1,553 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *
+ */
+
+#include "nsPNGDecoder.h"
+
+#include "nsIInputStream.h"
+
+#include "nspr.h"
+
+#include "nsIComponentManager.h"
+
+#include "png.h"
+
+#include "nsIStreamObserver.h"
+
+#include "nsRect.h"
+
+#include "nsMemory.h"
+
+#include "imgIContainerObserver.h"
+
+// XXX we need to be sure to fire onStopDecode messages to mObserver in error cases.
+
+
+NS_IMPL_ISUPPORTS2(nsPNGDecoder, imgIDecoder, nsIOutputStream)
+
+
+nsPNGDecoder::nsPNGDecoder()
+{
+  NS_INIT_ISUPPORTS();
+
+  mPNG = nsnull;
+  mInfo = nsnull;
+  colorLine = 0;
+  alphaLine = 0;
+  interlacebuf = 0;
+}
+
+nsPNGDecoder::~nsPNGDecoder()
+{
+  if (colorLine)
+    nsMemory::Free(colorLine);
+  if (alphaLine)
+    nsMemory::Free(alphaLine);
+  if (interlacebuf)
+    nsMemory::Free(interlacebuf);
+}
+
+
+/** imgIDecoder methods **/
+
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsPNGDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  /* do png init stuff */
+
+  /* Initialize the container's source image header. */
+  /* Always decode to 24 bit pixdepth */
+
+
+  mPNG = png_create_read_struct(PNG_LIBPNG_VER_STRING, 
+                                NULL, NULL, 
+                                NULL);
+  if (!mPNG) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mInfo = png_create_info_struct(mPNG);
+  if (!mInfo) {
+    png_destroy_read_struct(&mPNG, NULL, NULL);
+    return NS_ERROR_FAILURE;
+  }
+
+  /* use ic as libpng "progressive pointer" (retrieve in callbacks) */
+  png_set_progressive_read_fn(mPNG, NS_STATIC_CAST(png_voidp, this), nsPNGDecoder::info_callback, nsPNGDecoder::row_callback, nsPNGDecoder::end_callback);
+
+  return NS_OK;
+}
+
+
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsPNGDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+
+
+
+
+
+/** nsIOutputStream methods **/
+
+/* void close (); */
+NS_IMETHODIMP nsPNGDecoder::Close()
+{
+  if (mPNG)
+    png_destroy_read_struct(&mPNG, mInfo ? &mInfo : NULL, NULL);
+
+  return NS_OK;
+}
+
+/* void flush (); */
+NS_IMETHODIMP nsPNGDecoder::Flush()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsPNGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+static NS_METHOD ReadDataOut(nsIInputStream* in,
+                             void* closure,
+                             const char* fromRawSegment,
+                             PRUint32 toOffset,
+                             PRUint32 count,
+                             PRUint32 *writeCount)
+{
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, closure);
+
+  // we need to do the setjmp here otherwise bad things will happen
+  if (setjmp(decoder->mPNG->jmpbuf)) {
+    png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
+    // is this NS_ERROR_FAILURE enough?
+
+    decoder->mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
+
+    return NS_ERROR_FAILURE;
+  }
+
+  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
+  return NS_OK;
+}
+
+PRUint32 nsPNGDecoder::ProcessData(unsigned char *data, PRUint32 count)
+{
+  png_process_data(mPNG, mInfo, data, count);
+
+  return count; // we always consume all the data
+}
+
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsPNGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+//  PRUint32 sourceOffset = *_retval;
+
+  inStr->ReadSegments(ReadDataOut, this, count, _retval);
+
+  return NS_OK;
+}
+
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsPNGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsPNGDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPNGDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsPNGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPNGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+
+
+
+
+
+
+
+
+void
+nsPNGDecoder::info_callback(png_structp png_ptr, png_infop info_ptr)
+{
+/*  int number_passes;   NOT USED  */
+  png_uint_32 width, height;
+  int bit_depth, color_type, interlace_type, compression_type, filter_type;
+  int channels;
+  double LUT_exponent, CRT_exponent = 2.2, display_exponent, aGamma;
+
+  png_bytep trans=NULL;
+  int num_trans =0;
+
+  /* always decode to 24-bit RGB or 32-bit RGBA  */
+  png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+               &interlace_type, &compression_type, &filter_type);
+
+  if (color_type == PNG_COLOR_TYPE_PALETTE)
+    png_set_expand(png_ptr);
+
+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+    png_set_expand(png_ptr);
+
+  if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL);
+    png_set_expand(png_ptr);
+  }
+
+  if (bit_depth == 16)
+    png_set_strip_16(png_ptr);
+
+  if (color_type == PNG_COLOR_TYPE_GRAY ||
+      color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      png_set_gray_to_rgb(png_ptr);
+
+
+#ifdef XP_PC
+  // windows likes BGR
+  png_set_bgr(png_ptr);
+#endif
+
+  /* set up gamma correction for Mac, Unix and (Win32 and everything else)
+   * using educated guesses for display-system exponents; do preferences
+   * later */
+
+#if defined(XP_MAC)
+  LUT_exponent = 1.8 / 2.61;
+#elif defined(XP_UNIX)
+# if defined(__sgi)
+  LUT_exponent = 1.0 / 1.7;   /* typical default for SGI console */
+# elif defined(NeXT)
+  LUT_exponent = 1.0 / 2.2;   /* typical default for NeXT cube */
+# else
+  LUT_exponent = 1.0;         /* default for most other Unix workstations */
+# endif
+#else
+  LUT_exponent = 1.0;         /* virtually all PCs and most other systems */
+#endif
+
+  /* (alternatively, could check for SCREEN_GAMMA environment variable) */
+  display_exponent = LUT_exponent * CRT_exponent;
+
+  if (png_get_gAMA(png_ptr, info_ptr, &aGamma))
+      png_set_gamma(png_ptr, display_exponent, aGamma);
+  else
+      png_set_gamma(png_ptr, display_exponent, 0.45455);
+
+  /* let libpng expand interlaced images */
+  if (interlace_type == PNG_INTERLACE_ADAM7) {
+      /* number_passes = */
+      png_set_interlace_handling(png_ptr);
+  }
+
+  /* now all of those things we set above are used to update various struct
+   * members and whatnot, after which we can get channels, rowbytes, etc. */
+  png_read_update_info(png_ptr, info_ptr);
+  channels = png_get_channels(png_ptr, info_ptr);
+  PR_ASSERT(channels == 3 || channels == 4);
+
+  /*---------------------------------------------------------------*/
+  /* copy PNG info into imagelib structs (formerly png_set_dims()) */
+  /*---------------------------------------------------------------*/
+
+  PRInt32 alpha_bits = 1;
+
+  if (channels > 3) {
+    /* check if alpha is coming from a tRNS chunk and is binary */
+    if (num_trans) {
+      /* if it's not a indexed color image, tRNS means binary */
+      if (color_type == PNG_COLOR_TYPE_PALETTE) {
+        for (int i=0; i<num_trans; i++) {
+          if ((trans[i] != 0) && (trans[i] != 255)) {
+            alpha_bits = 8;
+            break;
+          }
+        }
+      }
+    } else {
+      alpha_bits = 8;
+    }
+  }
+
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartDecode(nsnull, nsnull);
+
+  // since the png is only 1 frame, initalize the container to the width and height of the frame
+  decoder->mImage->Init(width, height, decoder->mObserver);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImage);
+
+  decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+#if 0
+  // XXX should we longjmp to png_ptr->jumpbuf here if we failed?
+  if (!decoder->mFrame)
+    return NS_ERROR_FAILURE;
+#endif
+
+  gfx_format format;
+
+  if (channels == 3) {
+    format = gfxIFormats::RGB;
+  } else if (channels > 3) {
+    if (alpha_bits == 8) {
+      decoder->mImage->GetPreferredAlphaChannelFormat(&format);
+    } else if (alpha_bits == 1) {
+      format = gfxIFormats::RGB_A1;
+    }
+  }
+
+#ifdef XP_PC
+  // XXX this works...
+  format += 1; // RGB to BGR
+#endif
+
+  // then initalize the frame and append it to the container
+  decoder->mFrame->Init(0, 0, width, height, format);
+
+  decoder->mImage->AppendFrame(decoder->mFrame);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mFrame);
+
+  PRUint32 bpr, abpr;
+  decoder->mFrame->GetImageBytesPerRow(&bpr);
+  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
+  decoder->colorLine = (PRUint8 *)nsMemory::Alloc(bpr);
+  if (channels > 3)
+    decoder->alphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
+
+  if (interlace_type == PNG_INTERLACE_ADAM7) {
+    decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels*width*height);
+    decoder->ibpr = channels*width;
+    if (!decoder->interlacebuf) {
+//      return NS_ERROR_FAILURE;
+    }            
+  }
+
+  return;
+}
+
+
+
+
+
+void
+nsPNGDecoder::row_callback(png_structp png_ptr, png_bytep new_row,
+                           png_uint_32 row_num, int pass)
+{
+  /* libpng comments:
+   *
+   * this function is called for every row in the image.  If the
+   * image is interlacing, and you turned on the interlace handler,
+   * this function will be called for every row in every pass.
+   * Some of these rows will not be changed from the previous pass.
+   * When the row is not changed, the new_row variable will be NULL.
+   * The rows and passes are called in order, so you don't really
+   * need the row_num and pass, but I'm supplying them because it
+   * may make your life easier.
+   *
+   * For the non-NULL rows of interlaced images, you must call
+   * png_progressive_combine_row() passing in the row and the
+   * old row.  You can call this function for NULL rows (it will
+   * just return) and for non-interlaced images (it just does the
+   * memcpy for you) if it will make the code easier.  Thus, you
+   * can just do this for all cases:
+   *
+   *    png_progressive_combine_row(png_ptr, old_row, new_row);
+   *
+   * where old_row is what was displayed for previous rows.  Note
+   * that the first pass (pass == 0 really) will completely cover
+   * the old row, so the rows do not have to be initialized.  After
+   * the first pass (and only for interlaced images), you will have
+   * to pass the current row, and the function will combine the
+   * old row and the new row.
+   */
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+
+  PRUint32 bpr, abpr;
+  decoder->mFrame->GetImageBytesPerRow(&bpr);
+  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
+
+  png_bytep line;
+  if (decoder->interlacebuf) {
+    line = decoder->interlacebuf+(row_num*decoder->ibpr);
+    png_progressive_combine_row(png_ptr, line, new_row);
+  }
+  else
+    line = new_row;
+
+  if (new_row) {
+    nscoord width;
+    decoder->mFrame->GetWidth(&width);
+    PRUint32 iwidth = width;
+
+    gfx_format format;
+    decoder->mFrame->GetFormat(&format);
+    PRUint8 *aptr, *cptr;
+
+// The mac specific ifdefs in the code below are there to make sure we
+// always fill in 4 byte pixels right now, which is what the mac always
+// allocates for its pixel buffers in true color mode. This will change
+// when we start storing images with color palettes when they don't need
+// true color support (GIFs).
+    switch (format) {
+    case gfxIFormats::RGB:
+    case gfxIFormats::BGR:
+#ifdef XP_MAC
+        cptr = decoder->colorLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          *cptr++ = 0;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+#else
+        decoder->mFrame->SetImageData((PRUint8*)line, bpr, row_num*bpr);
+#endif
+      break;
+    case gfxIFormats::RGB_A1:
+    case gfxIFormats::BGR_A1:
+      {
+        cptr = decoder->colorLine;
+        aptr = decoder->alphaLine;
+        memset(aptr, 0, abpr);
+        for (PRUint32 x=0; x<iwidth; x++) {
+#ifdef XP_MAC
+          *cptr++ = 0;
+#endif
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          if (*line++) {
+            aptr[x>>3] |= 1<<(7-x&0x7);
+          }
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
+      }
+      break;
+    case gfxIFormats::RGB_A8:
+    case gfxIFormats::BGR_A8:
+      {
+        cptr = decoder->colorLine;
+        aptr = decoder->alphaLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+#ifdef XP_MAC
+          *cptr++ = 0;
+#endif
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *aptr++ = *line++;
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
+      }
+      break;
+    case gfxIFormats::RGBA:
+    case gfxIFormats::BGRA:
+#ifdef XP_MAC
+      {
+        cptr = decoder->colorLine;
+        aptr = decoder->alphaLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          *cptr++ = 0;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *aptr++ = *line++;
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
+      }
+#else
+      decoder->mFrame->SetImageData(line, bpr, row_num*bpr);
+#endif
+      break;
+    }
+
+    nsRect r(0, row_num, width, 1);
+    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mFrame, &r);
+  }
+}
+
+
+
+void
+nsPNGDecoder::end_callback(png_structp png_ptr, png_infop info_ptr)
+{
+  /* libpng comments:
+   *
+   * this function is called when the whole image has been read,
+   * including any chunks after the image (up to and including
+   * the IEND).  You will usually have the same info chunk as you
+   * had in the header, although some data may have been added
+   * to the comments and time fields.
+   *
+   * Most people won't do much here, perhaps setting a flag that
+   * marks the image as finished.
+   */
+
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+
+  if (decoder->mObserver) {
+    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mFrame);
+    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImage);
+    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+
+}
+

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.h

@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsPNGDecoder_h__
+#define nsPNGDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+
+#include "nsCOMPtr.h"
+
+#include "png.h"
+
+#define NS_PNGDECODER_CID \
+{ /* 36fa00c2-1dd2-11b2-be07-d16eeb4c50ed */         \
+     0x36fa00c2,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0xbe, 0x07, 0xd1, 0x6e, 0xeb, 0x4c, 0x50, 0xed} \
+}
+
+class nsPNGDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsPNGDecoder();
+  virtual ~nsPNGDecoder();
+
+PR_STATIC_CALLBACK(void)
+info_callback(png_structp png_ptr, png_infop info_ptr);
+PR_STATIC_CALLBACK(void)
+row_callback(png_structp png_ptr, png_bytep new_row,
+             png_uint_32 row_num, int pass);
+
+PR_STATIC_CALLBACK(void)
+end_callback(png_structp png_ptr, png_infop info_ptr);
+
+  inline PRUint32 ProcessData(unsigned char *data, PRUint32 count);
+
+
+public:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+
+  png_structp mPNG;
+  png_infop mInfo;
+  PRUint8 *colorLine, *alphaLine;
+  PRUint8 *interlacebuf;
+  PRUint32 ibpr;
+};
+
+#endif // nsPNGDecoder_h__

mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsIGenericFactory.h"
+#include "nsIModule.h"
+
+#include "nsPNGDecoder.h"
+
+// objects that just require generic constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsPNGDecoder)
+
+static nsModuleComponentInfo components[] =
+{
+  { "PNG decoder",
+    NS_PNGDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/png",
+    nsPNGDecoderConstructor, },
+  { "PNG decoder",
+    NS_PNGDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/x-png",
+    nsPNGDecoderConstructor, },
+};
+
+NS_IMPL_NSGETMODULE("nsPNGDecoderModule", components)
+

mozilla/modules/libpr0n/decoders/ppm/Makefile.in

@@ -0,0 +1,42 @@
+#
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= imgppm
+LIBRARY_NAME	= imgppm
+IS_COMPONENT	= 1
+
+REQUIRES	= xpcom layout necko gfx2 imglib2
+
+CPPSRCS		= nsPPMDecoder.cpp nsPPMFactory.cpp
+
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/ppm/makefile.win

@@ -0,0 +1,51 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imgppm
+LIBRARY_NAME	= imgppm
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsPPMDecoder.obj \
+		.\$(OBJDIR)\nsPPMFactory.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp

@@ -0,0 +1,305 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *
+ */
+
+#include "nsPPMDecoder.h"
+
+#include "nsIInputStream.h"
+#include "imgIContainer.h"
+#include "imgIContainerObserver.h"
+
+#include "nspr.h"
+
+#include "nsIComponentManager.h"
+
+#include "nsRect.h"
+
+NS_IMPL_ISUPPORTS2(nsPPMDecoder, imgIDecoder, nsIOutputStream)
+
+
+nsPPMDecoder::nsPPMDecoder()
+{
+  NS_INIT_ISUPPORTS();
+  mDataReceived = 0;
+  mDataWritten = 0;
+
+  mDataLeft = 0;
+  mPrevData = nsnull;
+}
+
+nsPPMDecoder::~nsPPMDecoder()
+{
+
+}
+
+
+/** imgIDecoder methods **/
+
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsPPMDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+  if (!mFrame)
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}
+
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsPPMDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+
+
+
+
+
+/** nsIOutputStream methods **/
+
+/* void close (); */
+NS_IMETHODIMP nsPPMDecoder::Close()
+{
+  if (mObserver) {
+    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
+    mObserver->OnStopContainer(nsnull, nsnull, mImage);
+    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+  
+  return NS_OK;
+}
+
+/* void flush (); */
+NS_IMETHODIMP nsPPMDecoder::Flush()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsPPMDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+static char *__itoa(int n)
+{
+	char *s;
+	int i, j, sign, tmp;
+	
+	/* check sign and convert to positive to stringify numbers */
+	if ( (sign = n) < 0)
+		n = -n;
+	i = 0;
+	s = (char*) malloc(sizeof(char));
+	
+	/* grow string as needed to add numbers from powers of 10 
+     * down till none left 
+     */
+	do
+	{
+		s = (char*) realloc(s, (i+1)*sizeof(char));
+		s[i++] = n % 10 + '0';  /* '0' or 30 is where ASCII numbers start */
+		s[i] = '\0';
+	}
+	while( (n /= 10) > 0);	
+	
+	/* tack on minus sign if we found earlier that this was negative */
+	if (sign < 0)
+	{
+		s = (char*) realloc(s, (i+1)*sizeof(char));
+		s[i++] = '-';
+	}
+	s[i] = '\0';
+	
+	/* pop numbers (and sign) off of string to push back into right direction */
+	for (i = 0, j = strlen(s) - 1; i < j; i++, j--)
+	{
+		tmp = s[i];
+		s[i] = s[j];
+		s[j] = tmp;
+	}
+	
+	return s;
+}
+
+
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsPPMDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  nsresult rv;
+
+  char *buf = (char *)PR_Malloc(count + mDataLeft);
+  if (!buf)
+    return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
+
+  
+  // read the data from the input stram...
+  PRUint32 readLen;
+  rv = inStr->Read(buf+mDataLeft, count, &readLen);
+
+  PRUint32 dataLen = readLen + mDataLeft;
+
+  if (mPrevData) {
+    strncpy(buf, mPrevData, mDataLeft);
+    PR_Free(mPrevData);
+    mPrevData = nsnull;
+    mDataLeft = 0;
+  }
+
+  char *data = buf;
+
+  if (NS_FAILED(rv)) return rv;
+
+  if (mDataReceived == 0) {
+
+    mObserver->OnStartDecode(nsnull, nsnull);
+
+    // Check the magic number
+    char type;
+    if ((sscanf(data, "P%c\n", &type) !=1) || (type != '6')) {
+      return NS_ERROR_FAILURE;
+    }
+    int i = 3;
+    data += i;
+
+#if 0
+    // XXX
+    // Ignore comments
+    while ((input = fgetc(f)) == '#')
+      fgets(junk, 512, f);
+    ungetc(input, f);
+#endif
+
+    // Read size
+    int w, h, mcv;
+
+    if (sscanf(data, "%d %d\n%d\n", &w, &h, &mcv) != 3) {
+      return NS_ERROR_FAILURE;
+    }
+    char *ws = __itoa(w), *hs = __itoa(h), *mcvs = __itoa(mcv);
+    int j = strlen(ws) + strlen(hs) + strlen(mcvs) + 3;
+    data += j;
+//    free(ws);
+//    free(hs);
+//    free(mcvs);
+
+    readLen -= i + j;
+    dataLen = readLen; // since this is the first pass, we don't have any data waiting that we need to keep track of
+
+    mImage->Init(w, h, mObserver);
+    if (mObserver)
+      mObserver->OnStartContainer(nsnull, nsnull, mImage);
+
+    mFrame->Init(0, 0, w, h, gfxIFormats::RGB);
+    mImage->AppendFrame(mFrame);
+    if (mObserver)
+      mObserver->OnStartFrame(nsnull, nsnull, mFrame);
+  }
+
+  PRUint32 bpr;
+  nscoord width;
+  mFrame->GetImageBytesPerRow(&bpr);
+  mFrame->GetWidth(&width);
+
+  // XXX ceil?
+  PRUint32 real_bpr = width * 3;
+  
+  PRUint32 i = 0;
+  PRUint32 rownum = mDataWritten / real_bpr;  // XXX this better not have a decimal
+  
+  PRUint32 wroteLen = 0;
+
+  if (readLen > real_bpr) {
+
+    do {
+      PRUint8 *line = (PRUint8*)data + i*real_bpr;
+      mFrame->SetImageData(line, real_bpr, (rownum++)*bpr);
+
+      nsRect r(0, rownum, width, 1);
+      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
+
+
+      wroteLen += real_bpr ;
+      i++;
+    } while(dataLen >= real_bpr * (i+1));
+
+  }
+  
+  mDataReceived += readLen;  // don't double count previous data that is in 'dataLen'
+  mDataWritten += wroteLen;
+
+  PRUint32 dataLeft = dataLen - wroteLen;
+
+  if (dataLeft > 0) {
+    if (mPrevData) {
+      mPrevData = (char *)PR_Realloc(mPrevData, mDataLeft + dataLeft);
+      strncpy(mPrevData + mDataLeft, data+wroteLen, dataLeft);
+      mDataLeft += dataLeft;
+
+    } else {
+      mDataLeft = dataLeft;
+      mPrevData = (char *)PR_Malloc(mDataLeft);
+      strncpy(mPrevData, data+wroteLen, mDataLeft);
+    }
+  }
+
+  PR_FREEIF(buf);
+
+  return NS_OK;
+}
+
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsPPMDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsPPMDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPPMDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsPPMDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPPMDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsPPMDecoder_h__
+#define nsPPMDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "nsCOMPtr.h"
+
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+#define NS_PPMDECODER_CID \
+{ /* e90bfa06-1dd1-11b2-8217-f38fe5d431a2 */         \
+     0xe90bfa06,                                     \
+     0x1dd1,                                         \
+     0x11b2,                                         \
+    {0x82, 0x17, 0xf3, 0x8f, 0xe5, 0xd4, 0x31, 0xa2} \
+}
+
+class nsPPMDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsPPMDecoder();
+  virtual ~nsPPMDecoder();
+
+private:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+
+  PRUint32 mDataReceived;
+  PRUint32 mDataWritten;
+
+  PRUint32 mDataLeft;
+  char *mPrevData;
+};
+
+#endif // nsPPMDecoder_h__

mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp

@@ -4,30 +4,39 @@
  * 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/MPL/
- *
+ * 
  * 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
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
  * Rights Reserved.
- *
- * Contributor(s):
- *   Doug Turner <dougt@netscape.com>
- *   Brian Ryner <bryner@netscape.com>
-*/
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
 
-#include "nsISupports.idl"
+#include "nsIGenericFactory.h"
+#include "nsIModule.h"
 
-[noscript, uuid(46235840-1dd2-11b2-846e-f26209b20804)]
-interface nsISSLSocketControl : nsISupports {
-    
-    void proxyStepUp();
-    void TLSStepUp();
+#include "nsPPMDecoder.h"
+
+// objects that just require generic constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsPPMDecoder)
+
+static nsModuleComponentInfo components[] =
+{
+  { "ppm decoder",
+    NS_PPMDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/x-portable-pixmap",
+    nsPPMDecoderConstructor, },
 };
 
+NS_IMPL_NSGETMODULE("nsPPMDecoderModule", components)
+

mozilla/modules/libpr0n/makefile.win

@@ -1,4 +1,3 @@
-#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -19,8 +18,8 @@
 #
 # Contributor(s): 
 
-DEPTH=..\..\..
+DEPTH=..\.. 
 
-DIRS= en-US
+DIRS = public src decoders
 
-include <$(DEPTH)\config\rules.mak>
+!include $(DEPTH)\config\rules.mak

mozilla/modules/libpr0n/public/ImageLogging.h

@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "prlog.h"
+
+#include "nsString.h"
+
+#if defined(PR_LOGGING)
+extern PRLogModuleInfo *gImgLog;
+
+class LogScope {
+public:
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn) :
+    mLog(aLog), mFrom(from), mFunc(fn)
+  {
+    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s {ENTER}\n",
+                                   mFrom, mFunc.get()));
+  }
+
+  /* const char * constructor */
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+           const nsLiteralCString &paramName, const char *paramValue) :
+    mLog(aLog), mFrom(from), mFunc(fn)
+  {
+    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%s\") {ENTER}\n",
+                                   mFrom, mFunc.get(),
+                                   paramName.get(),
+                                   paramValue));
+  }
+
+  /* void ptr constructor */
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+           const nsLiteralCString &paramName, const void *paramValue) :
+    mLog(aLog), mFrom(from), mFunc(fn)
+  {
+    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=%p) {ENTER}\n",
+                                   mFrom, mFunc.get(),
+                                   paramName.get(),
+                                   paramValue));
+  }
+
+  /* PRInt32 constructor */
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+           const nsLiteralCString &paramName, PRInt32 paramValue) :
+    mLog(aLog), mFrom(from), mFunc(fn)
+  {
+    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%d\") {ENTER}\n",
+                                   mFrom, mFunc.get(),
+                                   paramName.get(),
+                                   paramValue));
+  }
+
+  /* PRUint32 constructor */
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+           const nsLiteralCString &paramName, PRUint32 paramValue) :
+    mLog(aLog), mFrom(from), mFunc(fn)
+  {
+    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%d\") {ENTER}\n",
+                                   mFrom, mFunc.get(),
+                                   paramName.get(),
+                                   paramValue));
+  }
+
+
+  ~LogScope() {
+    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s {EXIT}\n",
+                                   mFrom, mFunc.get()));
+  }
+
+private:
+  PRLogModuleInfo *mLog;
+  void *mFrom;
+  nsCAutoString mFunc;
+};
+
+
+#define LOG_SCOPE(l, s) \
+  LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
+                                         NS_STATIC_CAST(void *, this), \
+                                         NS_LITERAL_CSTRING(s))
+
+#define LOG_SCOPE_WITH_PARAM(l, s, pn, pv) \
+  LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
+                                         NS_STATIC_CAST(void *, this), \
+                                         NS_LITERAL_CSTRING(s),        \
+                                         NS_LITERAL_CSTRING(pn), pv)
+
+#else
+#define LOG_SCOPE(l, s)
+#define LOG_SCOPE_WITH_PARAM(l, s, pn, pv)
+#endif

mozilla/modules/libpr0n/public/MANIFEST

@@ -0,0 +1 @@
+ImageLogging.h 

mozilla/modules/libpr0n/public/MANIFEST_IDL

@@ -0,0 +1,6 @@
+imgIContainer.idl
+imgIContainerObserver.idl
+imgIDecoder.idl
+imgIDecoderObserver.idl
+imgILoader.idl
+imgIRequest.idl

mozilla/modules/libpr0n/public/Makefile.in

@@ -3,20 +3,21 @@
 # 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/MPL/
-#
+# 
 # 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
 #
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Brian Ryner.
-# Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
-# All Rights Reserved.
-#
-# Contributor(s): 
-#  Brian Ryner <bryner@uiuc.edu>
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,6 +26,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+MODULE		= imglib2
+
+EXPORTS		= ImageLogging.h
+
+XPIDLSRCS	= imgIContainer.idl         \
+						imgIContainerObserver.idl \
+						imgIDecoder.idl           \
+						imgIDecoderObserver.idl	  \
+						imgILoader.idl            \
+						imgIRequest.idl
 
 include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/public/imgIContainer.idl

@@ -0,0 +1,109 @@
+/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+#include "gfxtypes.idl"
+#include "gfxIFormats.idl"
+
+interface gfxIImageFrame;
+interface nsIEnumerator;
+interface imgIContainerObserver;
+
+/**
+ * gfxIImageContainer interface
+ *
+ * @author Stuart Parmenter <pavlov@netscape.com>
+ * @version 0.1
+ * @see "gfx2"
+ */
+[scriptable, uuid(5e8405a4-1dd2-11b2-8385-bc8e3446cad3)]
+interface imgIContainer : nsISupports
+{
+  /**
+   * Create a new \a aWidth x \a aHeight sized image container.
+   *
+   * @param aWidth The width of the container in which all the
+   *               gfxIImageFrame children will fit.
+   * @param aHeight The height of the container in which all the
+   *                gfxIImageFrame children will fit.
+   * @param aObserver Observer to send animation notifications to.
+   */
+  void init(in nscoord aWidth,
+            in nscoord aHeight,
+            in imgIContainerObserver aObserver);
+
+
+  /* this should probably be on the device context (or equiv) */
+  readonly attribute gfx_format preferredAlphaChannelFormat;
+
+  /**
+   * The width of the container rectangle.
+   */
+  readonly attribute nscoord width;
+
+  /**
+   * The height of the container rectangle.
+   */
+  readonly attribute nscoord height;
+
+
+  /**
+   * Get the current frame that would be drawn if the image was to be drawn now
+   */
+  readonly attribute gfxIImageFrame currentFrame;
+
+
+  readonly attribute unsigned long numFrames;
+
+  gfxIImageFrame getFrameAt(in unsigned long index);
+
+  /**
+   * Adds \a item to the end of the list of frames.
+   * @param item frame to add.
+   */
+  void appendFrame(in gfxIImageFrame item);
+
+  void removeFrame(in gfxIImageFrame item);
+
+  /* notification when the current frame is done decoding */
+  void endFrameDecode(in unsigned long framenumber, in unsigned long timeout);
+  
+  /* notification that the entire image has been decoded */
+  void decodingComplete();
+  
+  nsIEnumerator enumerate();
+
+  void clear();
+
+  void startAnimation();
+
+  void stopAnimation();
+
+  /* animation stuff */
+
+  /**
+   * number of times to loop the image.
+   * @note -1 means forever.
+   */
+  attribute long loopCount;
+};

mozilla/modules/libpr0n/public/imgIContainerObserver.idl

@@ -1,45 +1,46 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Mozilla 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/MPL/
- *
+ * 
  * 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
+ * Copyright (C) 2001 Netscape Communications Corporation. All
  * Rights Reserved.
- *
+ * 
  * Contributor(s): 
- *  Patrick C. Beard <beard@netscape.com>
+ *   Stuart Parmenter <pavlov@netscape.com>
  */
 
-#ifndef nsThemeHandler_h___
-#define nsThemeHandler_h___
+#include "nsISupports.idl"
+#include "gfxtypes.idl"
 
-#include "nsIProtocolHandler.h"
+%{C++
+#include "nsRect.h"
+%}
 
-// {a5d25ff0-1dd1-11b2-8600-81d7a7540308}
-#define NS_THEMEHANDLER_CID     \
-{ 0xa5d25ff0, 0x1dd1, 0x11b2, \
-   {0x86, 0x00, 0x81, 0xd7, 0xa7, 0x54, 0x03, 0x08} }
+interface imgIContainer;
 
-class nsThemeHandler : public nsIProtocolHandler
+interface gfxIImageFrame;
+
+/**
+ * imgIContainerObserver interface
+ *
+ * @author Stuart Parmenter <pavlov@netscape.com>
+ * @version 0.1
+ */
+[uuid(153f1518-1dd2-11b2-b9cd-b16eb63e0471)]
+interface imgIContainerObserver : nsISupports
 {
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    nsThemeHandler();
-
-    static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
+  [noscript] void frameChanged(in imgIContainer aContainer, in nsISupports aCX,
+                               in gfxIImageFrame aFrame, in nsRect aDirtyRect);
 };
-
-#endif /* nsThemeHandler_h___ */

mozilla/modules/libpr0n/public/imgIDecoder.idl

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+#include "nsIOutputStream.idl"
+#include "gfxtypes.idl"
+
+interface imgIRequest;
+
+/**
+ * imgIDecoder interface
+ *
+ * @author Stuart Parmenter <pavlov@netscape.com>
+ * @version 0.1
+ * @see imagelib2
+ */
+[scriptable, uuid(9eebf43a-1dd1-11b2-953e-f1782f4cbad3)]
+interface imgIDecoder : nsIOutputStream
+{
+  /**
+   * Initalize an image decoder.
+   * @param aRequest the request that owns the decoder.
+   *
+   * @note The decode should QI \a aRequest to an imgIDecoderObserver
+   * and should send decoder notifications to the request.
+   * The decoder should always pass NULL as the first two parameters to
+   * all of the imgIDecoderObserver APIs.
+   */
+  void init(in imgIRequest aRequest);
+
+  /// allows access to the nsIImage we have to put bits in to.
+  readonly attribute imgIRequest request;
+};

mozilla/modules/libpr0n/public/imgIDecoderObserver.idl

@@ -0,0 +1,80 @@
+/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "imgIContainerObserver.idl"
+
+interface imgIRequest;
+interface imgIContainer;
+interface gfxIImageFrame;
+
+%{C++
+#include "nsRect.h"
+%}
+
+/**
+ * imgIDecoderObserver interface
+ *
+ * @author Stuart Parmenter <pavlov@netscape.com>
+ * @version 0.1
+ * @see imagelib2
+ */
+[scriptable, uuid(350163d2-1dd2-11b2-9e69-89959ecec1f3)]
+interface imgIDecoderObserver : imgIContainerObserver
+{
+  /**
+   * called as soon as the image begins getting decoded
+   */
+  void onStartDecode(in imgIRequest aRequest, in nsISupports cx);
+
+  /**
+   * called once the image has been inited and therefore has a width and height
+   */
+  void onStartContainer(in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer);
+
+  /**
+   * called when each frame is created
+   */
+  void onStartFrame(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame);
+
+  /**
+   * called when some part of the frame has new data in it
+   */
+  [noscript] void onDataAvailable(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame, [const] in nsRect aRect);
+
+  /**
+   * called when a frame is finished decoding
+   */
+  void onStopFrame(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame);
+
+  /**
+   * probably not needed.  called right before onStopDecode
+   */
+  void onStopContainer(in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer);
+
+  /**
+   * called when the decoder is dying off
+   */
+  void onStopDecode(in imgIRequest aRequest, in nsISupports cx,
+                    in nsresult status, in wstring statusArg);
+
+};

mozilla/modules/libpr0n/public/imgILoader.idl

@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+#include "gfxtypes.idl"
+
+interface imgIDecoderObserver;
+interface imgIRequest;
+
+interface nsIChannel;
+interface nsILoadGroup;
+interface nsIStreamListener;
+interface nsIURI;
+
+interface nsISimpleEnumerator;
+
+/**
+ * imgILoader interface
+ *
+ * @author Stuart Parmenter <pavlov@netscape.com>
+ * @version 0.1
+ * @see imagelib2
+ */
+[scriptable, uuid(4c8cf1e0-1dd2-11b2-aff9-c51cdbfcb6da)]
+interface imgILoader : nsISupports
+{
+  /**
+   * Start the load and decode of an image.
+   * @param uri the URI to load
+   * @param aObserver the observer
+   * @param cx some random data
+   */
+  imgIRequest loadImage(in nsIURI uri, in nsILoadGroup aLoadGroup, in imgIDecoderObserver aObserver, in nsISupports cx);
+
+  /**
+   * Start the load and decode of an image.
+   * @param uri the URI to load
+   * @param aObserver the observer
+   * @param cx some random data
+   */
+  imgIRequest loadImageWithChannel(in nsIChannel aChannel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener aListener);
+};

mozilla/modules/libpr0n/public/imgIRequest.idl

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+#include "nsIRequest.idl"
+
+interface imgIContainer;
+interface imgIDecoderObserver;
+interface nsIURI;
+
+/**
+ * imgIRequest interface
+ *
+ * @author Stuart Parmenter <pavlov@netscape.com>
+ * @version 0.1
+ * @see imagelib2
+ */
+[scriptable, uuid(ccf705f6-1dd1-11b2-82ef-e18eccf7f7ec)]
+interface imgIRequest : nsIRequest
+{
+  /**
+   * the image container...
+   * @return the image object associated with the request.
+   * @attention NEED DOCS
+   */
+  readonly attribute imgIContainer image;
+
+  /**
+   * Bits set in the return value from imageStatus
+   * @name statusflags
+   */
+  //@{
+  const long STATUS_NONE             = 0x0;
+  const long STATUS_SIZE_AVAILABLE   = 0x1;
+  const long STATUS_LOAD_COMPLETE    = 0x2;
+  const long STATUS_ERROR            = 0x4;
+  //@}
+
+  /**
+   * something
+   * @attention NEED DOCS
+   */
+  readonly attribute unsigned long imageStatus;
+
+  readonly attribute nsIURI URI;
+
+  readonly attribute imgIDecoderObserver decoderObserver;
+};
+
+%{C++
+
+/**
+ * imagelib specific nsresult success and error codes
+ */
+#define NS_IMAGELIB_SUCCESS_LOAD_FINISHED   NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_IMGLIB, 0)
+
+#define NS_IMAGELIB_ERROR_FAILURE           NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 5)
+#define NS_IMAGELIB_ERROR_NO_DECODER        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 6)
+
+%}

mozilla/modules/libpr0n/public/makefile.win

@@ -0,0 +1,43 @@
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH		= ..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE		= imglib2
+XPIDL_MODULE	= imglib2
+
+EXPORTS		= ImageLogging.h
+
+XPIDLSRCS	= \
+		.\imgIContainer.idl \
+		.\imgIContainerObserver.idl \
+		.\imgIDecoder.idl \
+		.\imgIDecoderObserver.idl \
+		.\imgILoader.idl \
+		.\imgIRequest.idl \
+		$(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+