mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
6d895baf1d
for me on optimized and debug gcc2.96, rh7.1.
- Better failure codes from nsXULPrototypeScript::Deserialize.
- Call nsXULDocument::AbortFastLoads after nsXULPrototypeScript::Serialize
failure, instead of just nulling the FastLoad service's output stream.
- Expose nsXULDocument::AbortFastLoads via nsIXULPrototypeCache, for use from
nsChromeProtocolHandler.cpp. AbortFastLoads flushes the XUL cache now, for
good measure.
- The needless "Current" adjective in nsIFastLoadService attribute and method
names is no more.
- Add a do_GetFastLoadService() helper, to use CID instead of contractid, and
to let the compiler consolidate the static inline CID.
- Add "nglayout.debug.checksum_xul_fastload_file" pref so people can do without
the checksum verification step when reading a FastLoad file.
- Verify the FastLoad file checksum, by default. Also, cache it in the FastLoad
service so we don't recompute it when re-opening the FastLoad file as mailnews
and other top-levels start up. Fill the checksum cache in EndFastLoad, when
the last pseudo-concurrent top-level finishes loading.
My hope to compute the checksum while writing the FastLoad file ran afoul of
misordered writes. The old code to checksum the in-memory nsFastLoadHeader
also was broken on little endian platforms. Now all checksumming is done via
a separate read pass over the complete file, save for the header's checksum
field, which is summed as if it contained zero.
- Track and check FastLoad file dependencies. This required groveling with a
bunch of Necko interfaces in nsChromeProtocolHandler::NewChannel -- read it
and weep. Dependency checking, as well as checksum access and computation,
use better-factored nsIFastLoad{File,Read,Write}Control interfaces.
- nsBufferedStream::Seek wasn't flushing the buffer when seeking backward
within the buffer, but it must, because mCursor bounds the amount to write
if the buffer contains the end of file.
- Add an unbufferedStream readonly attribute to nsIStreamBufferAccess, so we
don't have to screw around with the bufferying layer when checksumming. Also
implement nsIStreamBufferAccess in nsBufferedOutputStream.
- nsISeekableOutputStream was bogus, based on a bad state I had put the
nsBufferedOutputStream code in on its way from being completely broken when
you seek backwards outside of the buffer. Removing this interface required
using nsIFastLoadFileIO in nsFastLoadFileWriter, and it also required careful
ordering of Close calls (the Reader must close after the Writer or Updater,
so that the Reader's underlying, unbuffered input stream can be read by
nsFastLoadFileWriter::Close to compute the checksum.
- Miscellaneous tab/indentation, comment typo, bracing, if( => if ( style,
nsnull vs. 0, useless variable elimination, tortured control flow,
AutoString instead of String, and gratuitous ; after nsISupportsUtils.h
macro call cleanups.
154 lines
3.7 KiB
C++
154 lines
3.7 KiB
C++
/* nsJARInputStream.cpp
|
|
*
|
|
* 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 Netscape Communicator source 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):
|
|
* Mitch Stoltz <mstoltz@netscape.com>
|
|
*/
|
|
#include "nsJARInputStream.h"
|
|
#include "zipfile.h" // defines ZIP error codes
|
|
#include "nsZipArchive.h"
|
|
|
|
|
|
/*---------------------------------------------
|
|
* nsISupports implementation
|
|
*--------------------------------------------*/
|
|
|
|
NS_IMPL_THREADSAFE_ISUPPORTS1(nsJARInputStream, nsIInputStream);
|
|
|
|
/*----------------------------------------------------------
|
|
* nsJARInputStream implementation
|
|
*--------------------------------------------------------*/
|
|
|
|
NS_IMETHODIMP
|
|
nsJARInputStream::Available(PRUint32 *_retval)
|
|
{
|
|
if (Zip() == nsnull)
|
|
*_retval = 0;
|
|
else
|
|
*_retval = Zip()->Available(mReadInfo);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJARInputStream::Read(char* buf, PRUint32 count, PRUint32 *bytesRead)
|
|
{
|
|
if (Zip() == nsnull)
|
|
{
|
|
*bytesRead = 0;
|
|
return NS_OK;
|
|
}
|
|
|
|
PRInt32 err = Zip()->Read(mReadInfo, buf, count, bytesRead);
|
|
return err == ZIP_OK ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJARInputStream::ReadSegments(nsWriteSegmentFun writer, void * closure, PRUint32 count, PRUint32 *_retval)
|
|
{
|
|
char *readBuf = (char *)nsMemory::Alloc(count);
|
|
PRUint32 nBytes;
|
|
if (!readBuf)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
nsresult rv = Read(readBuf, count, &nBytes);
|
|
|
|
*_retval = 0;
|
|
if (NS_SUCCEEDED(rv)) {
|
|
rv = writer(this, closure, readBuf, 0, nBytes, _retval);
|
|
NS_ASSERTION(nBytes == *_retval, "Didn't write all Data.");
|
|
}
|
|
|
|
nsMemory::Free(readBuf);
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJARInputStream::GetNonBlocking(PRBool *aNonBlocking)
|
|
{
|
|
NS_NOTREACHED("GetNonBlocking");
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJARInputStream::GetObserver(nsIInputStreamObserver * *aObserver)
|
|
{
|
|
NS_NOTREACHED("GetObserver");
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJARInputStream::SetObserver(nsIInputStreamObserver * aObserver)
|
|
{
|
|
NS_NOTREACHED("SetObserver");
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJARInputStream::Close()
|
|
{
|
|
NS_IF_RELEASE(mJAR);
|
|
if (mReadInfo)
|
|
delete mReadInfo;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsJARInputStream::Init(nsJAR* aJAR, const char* aFilename)
|
|
{
|
|
if (!aFilename)
|
|
return NS_ERROR_NULL_POINTER;
|
|
mJAR = aJAR;
|
|
NS_ADDREF(mJAR);
|
|
|
|
PRInt32 result;
|
|
result = Zip()->ReadInit(aFilename, &mReadInfo);
|
|
if (result != ZIP_OK)
|
|
return NS_ERROR_FAILURE;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_METHOD
|
|
nsJARInputStream::Create(nsISupports* ignored, const nsIID& aIID, void* *aResult)
|
|
{
|
|
nsJARInputStream* is = new nsJARInputStream();
|
|
if (is == nsnull)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
NS_ADDREF(is);
|
|
nsresult rv = is->QueryInterface(aIID, aResult);
|
|
NS_RELEASE(is);
|
|
return rv;
|
|
}
|
|
|
|
//----------------------------------------------
|
|
// nsJARInputStream constructor and destructor
|
|
//----------------------------------------------
|
|
|
|
nsJARInputStream::nsJARInputStream()
|
|
: mJAR(nsnull), mReadInfo(nsnull)
|
|
{
|
|
NS_INIT_REFCNT();
|
|
}
|
|
|
|
nsJARInputStream::~nsJARInputStream()
|
|
{
|
|
Close();
|
|
}
|
|
|
|
|