mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-19 09:30:44 +00:00
Part of fix for bug 45225. I forget to rename the class nsAppleFileDecoder before the initial checkin. SR=mscott
This commit is contained in:
parent
e29100a3dc
commit
ee26174ac1
@ -26,15 +26,15 @@
|
||||
#include "nsCRT.h"
|
||||
|
||||
|
||||
NS_IMPL_THREADSAFE_ADDREF(nsAppleFileDecoder)
|
||||
NS_IMPL_THREADSAFE_RELEASE(nsAppleFileDecoder)
|
||||
NS_IMPL_THREADSAFE_ADDREF(nsDecodeAppleFile)
|
||||
NS_IMPL_THREADSAFE_RELEASE(nsDecodeAppleFile)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsAppleFileDecoder)
|
||||
NS_INTERFACE_MAP_BEGIN(nsDecodeAppleFile)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIOutputStream)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIOutputStream)
|
||||
NS_INTERFACE_MAP_END_THREADSAFE
|
||||
|
||||
nsAppleFileDecoder::nsAppleFileDecoder()
|
||||
nsDecodeAppleFile::nsDecodeAppleFile()
|
||||
{
|
||||
NS_INIT_ISUPPORTS();
|
||||
|
||||
@ -53,7 +53,7 @@ nsAppleFileDecoder::nsAppleFileDecoder()
|
||||
nsCRT::zero(&m_finderExtraInfo, sizeof(m_dates));
|
||||
}
|
||||
|
||||
nsAppleFileDecoder::~nsAppleFileDecoder()
|
||||
nsDecodeAppleFile::~nsDecodeAppleFile()
|
||||
{
|
||||
|
||||
PR_FREEIF(m_dataBuffer);
|
||||
@ -61,7 +61,7 @@ nsAppleFileDecoder::~nsAppleFileDecoder()
|
||||
delete [] m_entries;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::Initialize(nsIOutputStream *output, nsIFile *file)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::Initialize(nsIOutputStream *output, nsIFile *file)
|
||||
{
|
||||
m_output = output;
|
||||
|
||||
@ -74,7 +74,7 @@ NS_IMETHODIMP nsAppleFileDecoder::Initialize(nsIOutputStream *output, nsIFile *f
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::Close(void)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::Close(void)
|
||||
{
|
||||
nsresult rv;
|
||||
rv = m_output->Close();
|
||||
@ -163,42 +163,42 @@ NS_IMETHODIMP nsAppleFileDecoder::Close(void)
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::Flush(void)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::Flush(void)
|
||||
{
|
||||
return m_output->Flush();
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
|
||||
{
|
||||
return m_output->WriteFrom(inStr, count, _retval);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
|
||||
{
|
||||
return m_output->WriteSegments(reader, closure, count, _retval);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::GetNonBlocking(PRBool *aNonBlocking)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::GetNonBlocking(PRBool *aNonBlocking)
|
||||
{
|
||||
return m_output->GetNonBlocking(aNonBlocking);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::SetNonBlocking(PRBool aNonBlocking)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::SetNonBlocking(PRBool aNonBlocking)
|
||||
{
|
||||
return m_output->SetNonBlocking(aNonBlocking);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::GetObserver(nsIOutputStreamObserver * *aObserver)
|
||||
{
|
||||
return m_output->GetObserver(aObserver);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::SetObserver(nsIOutputStreamObserver * aObserver)
|
||||
{
|
||||
return m_output->SetObserver(aObserver);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsAppleFileDecoder::Write(const char *buffer, PRUint32 bufferSize, PRUint32* writeCount)
|
||||
NS_IMETHODIMP nsDecodeAppleFile::Write(const char *buffer, PRUint32 bufferSize, PRUint32* writeCount)
|
||||
{
|
||||
/* WARNING: to simplify my life, I presume that I should get all appledouble headers in the first block,
|
||||
else I would have to implement a buffer */
|
||||
|
@ -92,14 +92,14 @@ enum {
|
||||
};
|
||||
|
||||
|
||||
class nsAppleFileDecoder : public nsIOutputStream
|
||||
class nsDecodeAppleFile : public nsIOutputStream
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOUTPUTSTREAM
|
||||
|
||||
nsAppleFileDecoder();
|
||||
virtual ~nsAppleFileDecoder();
|
||||
nsDecodeAppleFile();
|
||||
virtual ~nsDecodeAppleFile();
|
||||
|
||||
nsresult Initialize(nsIOutputStream *output, nsIFile *file);
|
||||
|
||||
|
@ -765,10 +765,10 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel * aChannel)
|
||||
if (contentType && !nsCRT::strcasecmp(contentType, APPLICATION_APPLEFILE))
|
||||
{
|
||||
nsCOMPtr<nsIOutputStream> appleFileDecoder;
|
||||
NS_NEWXPCOM(appleFileDecoder, nsAppleFileDecoder);
|
||||
NS_NEWXPCOM(appleFileDecoder, nsDecodeAppleFile);
|
||||
if (appleFileDecoder)
|
||||
{
|
||||
NS_STATIC_CAST(nsAppleFileDecoder*, NS_STATIC_CAST(nsIOutputStream*, appleFileDecoder))->Initialize(mOutStream, mTempFile);
|
||||
NS_STATIC_CAST(nsDecodeAppleFile*, NS_STATIC_CAST(nsIOutputStream*, appleFileDecoder))->Initialize(mOutStream, mTempFile);
|
||||
mOutStream = appleFileDecoder;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user