temp backout mac breakage

This commit is contained in:
ftang%netscape.com 1999-09-10 20:33:12 +00:00
parent c223f99fe8
commit e61d269a02
2 changed files with 2 additions and 183 deletions

View File

@ -1,4 +1,4 @@
const /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
/* -*- 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.0 (the "License"); you may not use this file except in
@ -59,183 +59,6 @@ NS_IMETHODIMP nsUnicodeToUCS2BE::GetMaxLength(const PRUnichar * aSrc,
}
NS_IMETHODIMP nsUnicodeToUCS2BE::FillInfo(PRUint32 *aInfo)
{
::memset(aInfo, 0xFF, (0x10000L >> 3));
memset(aInfo, 0xFF, (0x10000L >> 3));
return NS_OK;
}
class nsUnicodeToUTF16SameEndian: public nsBasicEncoder
{
public:
/**
* Class constructor.
*/
nsUnicodeToUTF16SameEndian( PRUnichar aBOM )
{
mBOM = aBOM;
};
/**
* Class destructor.
*/
virtual ~nsUnicodeToUTF16SameEndian() {};
//--------------------------------------------------------------------
// Interface nsIUnicodeEncoder [declaration]
NS_IMETHOD Convert(const PRUnichar * aSrc, PRInt32 * aSrcLength,
char * aDest, PRInt32 * aDestLength)
{
PRInt32 srcInLen = *aSrcLength;
PRInt32 destInLen = *aDestLength;
PRInt32 srcOutLen = 0;
PRInt32 destOutLen = 0;
PRInt32 copyCharLen;
PRUnichar *p = (PRUnichar*)aDest;
// Handle BOM if necessary
if(0!=mBOM)
{
if(destInLen <2)
goto needmoreoutput;
*p++ = mBOM;
mBOM = 0;
destOutLen +=2;
}
// find out the length of copy
copyCharLen = srcInLen;
if(copyCharLen > (destInLen - destOutLen) / 2) {
copyCharLen = (destInLen - destOutLen) / 2;
}
// copy the data by swaping
CopyData((char*)p , aSrc, copyCharLen );
srcOutLen += copyCharLen;
destOutLen += copyCharLen * 2;
if(copyCharLen < srcInLen)
goto needmoreoutput;
*aSrcLength = srcOutLen;
*aDestLength = destOutLen;
return NS_OK;
needmoreoutput:
*aSrcLength = srcOutLen;
*aDestLength = destOutLen;
return NS_OK_UENC_MOREOUTPUT;
};
NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength,
PRInt32 * aDestLength)
{
if(0 != mBOM)
*aDestLength = 2*(aSrcLength+1);
else
*aDestLength = 2*aSrcLength;
return NS_OK_UENC_EXACTLENGTH;
};
NS_IMETHOD Finish(char * aDest, PRInt32 * aDestLength)
{
if(0 != mBOM)
{
if(*aDestLength >= 2)
{
*((PRUnichar*)aDest)= mBOM;
mBOM=0;
*aDestLength = 2;
return NS_OK;
} else {
*aDestLength = 0;
return NS_OK; // xxx should be error
}
} else {
*aDestLength = 0;
return NS_OK;
}
};
NS_IMETHOD Reset()
{
mBOM = 0;
return NS_OK;
};
NS_IMETHOD SetOutputErrorBehavior(PRInt32 aBehavior,
nsIUnicharEncoder * aEncoder, PRUnichar aChar)
{
return NS_OK;
};
//--------------------------------------------------------------------
// Interface nsICharRepresentable [declaration]
NS_IMETHOD FillInfo(PRUint32 *aInfo)
{
::memset(aInfo, 0xFF, (0x10000L >> 3));
return NS_OK;
};
protected:
PRUnichar mBOM;
virtual void CopyData(char* aDest, const PRUnichar* aSrc, PRInt32 aLen )
{
::memcpy(aDest, (void*) aSrc, aLen * 2);
};
};
class nsUnicodeToUTF16DiffEndian: public nsUnicodeToUTF16SameEndian
{
public:
/**
* Class constructor.
*/
nsUnicodeToUTF16DiffEndian( PRUnichar aBOM )
: nsUnicodeToUTF16SameEndian(aBOM ) { };
/**
* Class destructor.
*/
virtual ~nsUnicodeToUTF16DiffEndian() {};
//--------------------------------------------------------------------
// Interface nsIUnicodeEncoder [declaration]
protected:
virtual void CopyData(char* aDest, const PRUnichar* aSrc, PRInt32 aLen )
{
PRUnichar *p = (PRUnichar*) aDest;
// copy the data by swaping
for(PRInt32 i; i < aLen; i++)
{
PRUnichar aChar = *aSrc++;
*p++ = (0x00FF & (aChar >> 8)) | (0xFF00 & (aChar << 8));
}
};
};
static char BOM[] = {(char)0xfe, (char)0xff};
#define IsBigEndian() (0xFEFF == *((PRUint16*)BOM))
nsresult NEW_UnicodeToUTF16BE(nsISupports **aResult)
{
if(IsBigEndian()) {
*aResult = (nsIUnicodeEncoder*)new nsUnicodeToUTF16SameEndian(0);
} else {
*aResult = (nsIUnicodeEncoder*)new nsUnicodeToUTF16DiffEndian(0);
}
return (NULL == *aResult) ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
}
nsresult NEW_UnicodeToUTF16LE(nsISupports **aResult)
{
if(IsBigEndian()) {
*aResult = (nsIUnicodeEncoder*)new nsUnicodeToUTF16DiffEndian(0);
} else {
*aResult = (nsIUnicodeEncoder*)new nsUnicodeToUTF16SameEndian(0);
}
return (NULL == *aResult) ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
}
nsresult NEW_UnicodeToUTF16(nsISupports **aResult)
{
*aResult = (nsIUnicodeEncoder*)new nsUnicodeToUTF16SameEndian(0xFEFF);
return (NULL == *aResult) ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
}

View File

@ -56,8 +56,4 @@ protected:
PRInt32 * aDestLength);
};
nsresult NEW_UnicodeToUTF16BE(nsISupports **Result);
nsresult NEW_UnicodeToUTF16LE(nsISupports **Result);
nsresult NEW_UnicodeToUTF16(nsISupports **Result);
#endif /* nsUnicodeToUCS2BE_h___ */