mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
*** empty log message ***
This commit is contained in:
parent
c409be364f
commit
4be86e7b2f
@ -97,7 +97,7 @@ MODULE_PRIVATE csname2id_t csname2id_tbl[] = {
|
||||
{"x-cns11643-16", "", CS_CNS11643_16},
|
||||
{"VISCII", "", CS_VISCII},
|
||||
{"VIQR", "", CS_VIQR},
|
||||
{"KOI8-U", "", CS_KOI8_U},
|
||||
{"koi8-u", "", CS_KOI8_U},
|
||||
{"iso-ir-111", "", CS_ISO_IR_111},
|
||||
{"iso_8859-6-e", "", CS_8859_6_E},
|
||||
{"iso_8859-6-i", "", CS_8859_6_I},
|
||||
@ -221,6 +221,9 @@ MODULE_PRIVATE csname2id_t csname2id_tbl[] = {
|
||||
/* aliases for koi8-r: */
|
||||
{"csKOI8R", "", CS_KOI8_R},
|
||||
|
||||
/* aliases for koi8-u: */
|
||||
{"koi8-ru", "", CS_KOI8_U},
|
||||
|
||||
/* aliases for Shift_JIS: */
|
||||
{"x-sjis", "", CS_SJIS},
|
||||
{"ms_Kanji", "", CS_SJIS},
|
||||
|
@ -480,6 +480,9 @@ MODULE_PRIVATE cscvt_t cscvt_tbl[] = {
|
||||
{CS_CP_1251, CS_KOI8_R, 0, (CCCFunc)One2OneCCC, 0},
|
||||
{CS_KOI8_R, CS_CP_1251, 0, (CCCFunc)One2OneCCC, 0},
|
||||
|
||||
/* UKRAINIAN */
|
||||
{CS_KOI8_U, CS_KOI8_U, 0, (CCCFunc)0, 0},
|
||||
|
||||
/* ARMENIAN */
|
||||
{CS_ARMSCII8, CS_ARMSCII8, 0, (CCCFunc)0, 0},
|
||||
|
||||
@ -560,6 +563,7 @@ MODULE_PRIVATE cscvt_t cscvt_tbl[] = {
|
||||
{CS_LATIN2, CS_UTF8, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_SINGLEBYTE},
|
||||
{CS_8859_5, CS_UTF8, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_SINGLEBYTE},
|
||||
{CS_KOI8_R, CS_UTF8, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_SINGLEBYTE},
|
||||
{CS_KOI8_U, CS_UTF8, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_SINGLEBYTE},
|
||||
{CS_8859_7, CS_UTF8, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_SINGLEBYTE},
|
||||
{CS_8859_9, CS_UTF8, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_SINGLEBYTE},
|
||||
{CS_SJIS, CS_UTF8, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_SJIS},
|
||||
@ -574,6 +578,7 @@ MODULE_PRIVATE cscvt_t cscvt_tbl[] = {
|
||||
{CS_UTF8, CS_LATIN2, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_UTF8},
|
||||
{CS_UTF8, CS_8859_5, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_UTF8},
|
||||
{CS_UTF8, CS_KOI8_R, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_UTF8},
|
||||
{CS_UTF8, CS_KOI8_U, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_UTF8},
|
||||
{CS_UTF8, CS_8859_7, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_UTF8},
|
||||
{CS_UTF8, CS_8859_9, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_UTF8},
|
||||
{CS_UTF8, CS_SJIS, 0, (CCCFunc)mz_AnyToAnyThroughUCS2, INTL_CHARLEN_UTF8},
|
||||
|
@ -443,6 +443,19 @@ PRIVATE unsigned char lower_lookup_koi8_r[128]={
|
||||
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
|
||||
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf
|
||||
};
|
||||
/*
|
||||
* lower_lookup_koi8_u map
|
||||
*/
|
||||
PRIVATE unsigned char lower_lookup_koi8_u[128]={
|
||||
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
|
||||
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
|
||||
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
|
||||
0xb0, 0xb1, 0xb2, 0xa3, 0xa4, 0xb5, 0xa6, 0xa7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xad, 0xbe, 0xbf,
|
||||
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
|
||||
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
|
||||
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
|
||||
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf
|
||||
};
|
||||
|
||||
#ifdef XP_OS2
|
||||
/*
|
||||
@ -659,6 +672,8 @@ MODULE_PRIVATE unsigned char *INTL_GetSingleByteToLowerMap(int16 csid)
|
||||
#endif
|
||||
case CS_KOI8_R:
|
||||
return lower_lookup_koi8_r;
|
||||
case CS_KOI8_U:
|
||||
return lower_lookup_koi8_u;
|
||||
case CS_ARMSCII8:
|
||||
return lower_armscii8;
|
||||
|
||||
|
@ -193,6 +193,13 @@ PRIVATE uint16 iso88599ToTbl[] = {
|
||||
#include "8859-9.ut"
|
||||
};
|
||||
/*--------------------------------------------------------------------------*/
|
||||
PRIVATE uint16 koi8uFromTbl[] = {
|
||||
#include "koi8u.uf"
|
||||
};
|
||||
PRIVATE uint16 koi8uToTbl[] = {
|
||||
#include "koi8u.ut"
|
||||
};
|
||||
/*--------------------------------------------------------------------------*/
|
||||
PRIVATE uint16 koi8rFromTbl[] = {
|
||||
#include "koi8r.uf"
|
||||
};
|
||||
@ -319,6 +326,7 @@ PRIVATE uint16 TIS620ToTbl[] = {
|
||||
/*--------------------------------------------------------------------------*/
|
||||
PRIVATE uTable* LoadToUCS2Table(uint16 csid)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid) {
|
||||
case CS_ASCII:
|
||||
return (uTable*) asciiTbl;
|
||||
@ -339,6 +347,9 @@ PRIVATE uTable* LoadToUCS2Table(uint16 csid)
|
||||
case CS_KOI8_R:
|
||||
return (uTable*) koi8rToTbl;
|
||||
|
||||
case CS_KOI8_U:
|
||||
return (uTable*) koi8uToTbl;
|
||||
|
||||
case CS_CP_1251:
|
||||
return (uTable*) cp1251ToTbl;
|
||||
|
||||
@ -404,6 +415,7 @@ PRIVATE uTable* LoadToUCS2Table(uint16 csid)
|
||||
}
|
||||
PRIVATE uTable* LoadFromUCS2Table(uint16 csid)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid) {
|
||||
case CS_ASCII:
|
||||
return (uTable*) asciiTbl;
|
||||
@ -424,6 +436,9 @@ PRIVATE uTable* LoadFromUCS2Table(uint16 csid)
|
||||
case CS_KOI8_R:
|
||||
return (uTable*) koi8rFromTbl;
|
||||
|
||||
case CS_KOI8_U:
|
||||
return (uTable*) koi8uFromTbl;
|
||||
|
||||
case CS_CP_1251:
|
||||
return (uTable*) cp1251FromTbl;
|
||||
|
||||
@ -523,6 +538,7 @@ PRIVATE uTable* LoadUCS2Table(uint16 csid,int from)
|
||||
{
|
||||
/* We need to add reference count here */
|
||||
Handle tableHandle;
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid)
|
||||
{
|
||||
case CS_ASCII:
|
||||
@ -555,6 +571,7 @@ PRIVATE void UnloadUCS2Table(uint16 csid, uTable *utblPtr, int from)
|
||||
{
|
||||
/* We need to add reference count here */
|
||||
Handle tableHandle;
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid)
|
||||
{
|
||||
case CS_ASCII:
|
||||
@ -579,24 +596,28 @@ PRIVATE void UnloadUCS2Table(uint16 csid, uTable *utblPtr, int from)
|
||||
/*--------------------------------------------------------------------------*/
|
||||
PRIVATE uTable* LoadToUCS2Table(uint16 csid)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
return LoadUCS2Table(csid, FALSE);
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
/*--------------------------------------------------------------------------*/
|
||||
PRIVATE void UnloadToUCS2Table(uint16 csid, uTable *utblPtr)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
UnloadUCS2Table(csid, utblPtr, FALSE);
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
/*--------------------------------------------------------------------------*/
|
||||
PRIVATE uTable* LoadFromUCS2Table(uint16 csid)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
return LoadUCS2Table(csid, TRUE);
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
/*--------------------------------------------------------------------------*/
|
||||
PRIVATE void UnloadFromUCS2Table(uint16 csid, uTable *utblPtr)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
UnloadUCS2Table(csid, utblPtr, TRUE);
|
||||
}
|
||||
#endif /* XP_MAC */
|
||||
@ -620,6 +641,7 @@ PRLibrary* uniLib = NULL;
|
||||
PRIVATE uTable* LoadUCS2Table(uint16 csid, int from)
|
||||
{
|
||||
uTable* ret = NULL;
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid)
|
||||
{
|
||||
case CS_ASCII:
|
||||
@ -654,6 +676,7 @@ PRIVATE uTable* LoadUCS2Table(uint16 csid, int from)
|
||||
}
|
||||
PRIVATE void UnloadUCS2Table(uint16 csid, uTable* utblPtr, int from)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid)
|
||||
{
|
||||
case CS_ASCII:
|
||||
@ -684,18 +707,22 @@ PRIVATE void UnloadUCS2Table(uint16 csid, uTable* utblPtr, int from)
|
||||
}
|
||||
PRIVATE uTable* LoadToUCS2Table(uint16 csid)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
return(LoadUCS2Table(csid,0));
|
||||
}
|
||||
PRIVATE void UnloadToUCS2Table(uint16 csid, uTable *utblPtr)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
UnloadUCS2Table(csid, utblPtr, 0);
|
||||
}
|
||||
PRIVATE uTable* LoadFromUCS2Table(uint16 csid)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
return(LoadUCS2Table(csid,1));
|
||||
}
|
||||
PRIVATE void UnloadFromUCS2Table(uint16 csid, uTable *utblPtr)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
UnloadUCS2Table(csid, utblPtr, 1);
|
||||
}
|
||||
#endif /* XP_WIN */
|
||||
@ -941,6 +968,7 @@ PRIVATE uint16 dingbatToTbl[] = {
|
||||
* Return the address of the To table given the codeset
|
||||
*/
|
||||
PRIVATE uTable* LoadToUCS2Table(uint16 csid) {
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid) {
|
||||
case CS_ASCII:
|
||||
case CS_LATIN1: return (uTable*) cp1252ToTbl;
|
||||
@ -984,6 +1012,7 @@ PRIVATE uTable* LoadToUCS2Table(uint16 csid) {
|
||||
* Return the address of the From table given the codeset
|
||||
*/
|
||||
PRIVATE uTable* LoadFromUCS2Table(uint16 csid) {
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
switch(csid) {
|
||||
case CS_ASCII:
|
||||
case CS_LATIN1: return (uTable*) cp1252FromTbl;
|
||||
@ -1442,6 +1471,7 @@ LoadUCS2TableSet(uint16 csid, uTableSet* tableset,int from)
|
||||
{
|
||||
UnicodeTableSet* set;
|
||||
int i;
|
||||
XP_ASSERT( (CS_UNKNOWN != csid) && (CS_DEFAULT != csid));
|
||||
for(i=0;i<MAXINTERCSID;i++)
|
||||
{
|
||||
tableset->range[i].intercsid=CS_DEFAULT;
|
||||
@ -1643,6 +1673,7 @@ PUBLIC void INTL_UnicodeToStr(
|
||||
static uint16 num;
|
||||
static uTableSet tableset;
|
||||
static INTL_Encoding_ID lastEncoding = (INTL_Encoding_ID)INVALID_ENCODING_ID;
|
||||
XP_ASSERT( (CS_UNKNOWN != encoding) && (CS_DEFAULT != encoding));
|
||||
|
||||
if (encoding != lastEncoding)
|
||||
{
|
||||
@ -1819,6 +1850,7 @@ PUBLIC uint32 INTL_StrToUnicodeLen(
|
||||
unsigned char* src
|
||||
)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != encoding) && (CS_DEFAULT != encoding));
|
||||
/* for now, put a dump algorithm to caculate the length */
|
||||
return INTL_TextToUnicodeLen(encoding, src, XP_STRLEN((char*)src));
|
||||
}
|
||||
@ -1832,6 +1864,7 @@ PUBLIC uint32 INTL_StrToUnicode(
|
||||
)
|
||||
{
|
||||
uint32 len = XP_STRLEN((char*)src);
|
||||
XP_ASSERT( (CS_UNKNOWN != encoding) && (CS_DEFAULT != encoding));
|
||||
return INTL_TextToUnicode(encoding,src,len,ustr,ubuflen);
|
||||
}
|
||||
PUBLIC uint32 INTL_TextToUnicodeLen(
|
||||
@ -1840,6 +1873,7 @@ PUBLIC uint32 INTL_TextToUnicodeLen(
|
||||
uint32 srclen
|
||||
)
|
||||
{
|
||||
XP_ASSERT( (CS_UNKNOWN != encoding) && (CS_DEFAULT != encoding));
|
||||
/* for now, put a dump algorithm to caculate the length */
|
||||
return srclen + 1;
|
||||
}
|
||||
@ -1857,6 +1891,7 @@ PUBLIC uint32 INTL_TextToUnicode(
|
||||
uint32 validlen;
|
||||
uint16 num,scanlen, med;
|
||||
uTableSet tableset;
|
||||
XP_ASSERT( (CS_UNKNOWN != encoding) && (CS_DEFAULT != encoding));
|
||||
num = LoadUCS2TableSet(encoding, &tableset,FALSE);
|
||||
for(validlen=0; ((srclen > 0) && ((*src) != '\0') && (ubuflen > 1));
|
||||
srclen -= scanlen, src += scanlen, ustr++, ubuflen--,validlen++)
|
||||
|
Loading…
Reference in New Issue
Block a user