Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - added whitespace around operators, some blank lines, fixed comment typos, renamed out-in vars to outBuff-inBuff

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-04-05 18:02:26 +00:00
parent 20002db0f8
commit d32a507d02
1 changed files with 179 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
src/common/strconv.cpp
View File

@@ -203,8 +203,8 @@ wxMBConv::ToWChar(wchar_t *dst, size_t dstLen,
size_t lenChunk = MB2WC(NULL, src, 0); size_t lenChunk = MB2WC(NULL, src, 0);
if ( lenChunk == 0 ) if ( lenChunk == 0 )
{ {
// nothing left in the input string, conversion succeeded; but // nothing left in the input string, conversion succeeded;
// still account for the trailing NULL // but still account for the trailing NULL
dstWritten++; dstWritten++;
break; break;
} }
@@ -229,7 +229,7 @@ wxMBConv::ToWChar(wchar_t *dst, size_t dstLen,
if ( !srcEnd ) if ( !srcEnd )
{ {
// we convert the entire string in this cas, as we suppose that the // we convert the entire string in this case, as we suppose that the
// string is NUL-terminated and so srcEnd is not used at all // string is NUL-terminated and so srcEnd is not used at all
break; break;
} }
@@ -277,7 +277,7 @@ wxMBConv::FromWChar(char *dst, size_t dstLen,
{ {
// make a copy in order to properly NUL-terminate the string // make a copy in order to properly NUL-terminate the string
bufTmp = wxWCharBuffer(srcLen); bufTmp = wxWCharBuffer(srcLen);
memcpy(bufTmp.data(), src, srcLen*sizeof(wchar_t)); memcpy(bufTmp.data(), src, srcLen * sizeof(wchar_t));
src = bufTmp; src = bufTmp;
} }
@@ -310,10 +310,10 @@ wxMBConv::FromWChar(char *dst, size_t dstLen,
return dstWritten; return dstWritten;
} }
size_t wxMBConv::MB2WC(wchar_t *out, const char *in, size_t outLen) const size_t wxMBConv::MB2WC(wchar_t *outBuff, const char *inBuff, size_t outLen) const
{ {
size_t rc = ToWChar(out, outLen, in); size_t rc = ToWChar(outBuff, outLen, inBuff);
if ( rc != wxCONV_FAILED ) if ( rc != (size_t)wxCONV_FAILED )
{ {
// ToWChar() returns the buffer length, i.e. including the trailing // ToWChar() returns the buffer length, i.e. including the trailing
// NUL, while this method doesn't take it into account // NUL, while this method doesn't take it into account
@@ -323,10 +323,10 @@ size_t wxMBConv::MB2WC(wchar_t *out, const char *in, size_t outLen) const
return rc; return rc;
} }
size_t wxMBConv::WC2MB(char *out, const wchar_t *in, size_t outLen) const size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) const
{ {
size_t rc = FromWChar(out, outLen, in); size_t rc = FromWChar(outBuff, outLen, inBuff);
if ( rc != wxCONV_FAILED ) if ( rc != (size_t)wxCONV_FAILED )
{ {
rc -= GetMBNulLen(); rc -= GetMBNulLen();
} }
@@ -345,7 +345,7 @@ const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
{ {
// calculate the length of the buffer needed first // calculate the length of the buffer needed first
const size_t nLen = MB2WC(NULL, psz, 0); const size_t nLen = MB2WC(NULL, psz, 0);
if ( nLen != wxCONV_FAILED ) if ( nLen != (size_t)wxCONV_FAILED )
{ {
// now do the actual conversion // now do the actual conversion
wxWCharBuffer buf(nLen /* +1 added implicitly */); wxWCharBuffer buf(nLen /* +1 added implicitly */);
@@ -364,7 +364,7 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
if ( pwz ) if ( pwz )
{ {
const size_t nLen = WC2MB(NULL, pwz, 0); const size_t nLen = WC2MB(NULL, pwz, 0);
if ( nLen != wxCONV_FAILED ) if ( nLen != (size_t)wxCONV_FAILED )
{ {
// extra space for trailing NUL(s) // extra space for trailing NUL(s)
static const size_t extraLen = GetMaxMBNulLen(); static const size_t extraLen = GetMaxMBNulLen();
@@ -379,13 +379,13 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
} }
const wxWCharBuffer const wxWCharBuffer
wxMBConv::cMB2WC(const char *in, size_t inLen, size_t *outLen) const wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
{ {
const size_t dstLen = ToWChar(NULL, 0, in, inLen); const size_t dstLen = ToWChar(NULL, 0, inBuff, inLen);
if ( dstLen != wxCONV_FAILED ) if ( dstLen != (size_t)wxCONV_FAILED )
{ {
wxWCharBuffer wbuf(dstLen - 1); wxWCharBuffer wbuf(dstLen - 1);
if ( ToWChar(wbuf.data(), dstLen, in, inLen) ) if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) )
{ {
if ( outLen ) if ( outLen )
*outLen = dstLen - 1; *outLen = dstLen - 1;
@@ -400,16 +400,17 @@ wxMBConv::cMB2WC(const char *in, size_t inLen, size_t *outLen) const
} }
const wxCharBuffer const wxCharBuffer
wxMBConv::cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
{ {
const size_t dstLen = FromWChar(NULL, 0, in, inLen); const size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
if ( dstLen != wxCONV_FAILED ) if ( dstLen != (size_t)wxCONV_FAILED )
{ {
wxCharBuffer buf(dstLen - 1); wxCharBuffer buf(dstLen - 1);
if ( FromWChar(buf.data(), dstLen, in, inLen) ) if ( FromWChar(buf.data(), dstLen, inBuff, inLen) )
{ {
if ( outLen ) if ( outLen )
*outLen = dstLen - 1; *outLen = dstLen - 1;
return buf; return buf;
} }
} }
@@ -611,6 +612,7 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// plain ASCII char // plain ASCII char
if (buf) if (buf)
*buf++ = (char)cc; *buf++ = (char)cc;
len++; len++;
} }
#ifndef WC_UTF16 #ifndef WC_UTF16
@@ -655,13 +657,16 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
len++; len++;
} }
} }
if (buf) if (buf)
*buf++ = '-'; *buf++ = '-';
len++; len++;
} }
} }
if (buf && (len < n)) if (buf && (len < n))
*buf = 0; *buf = 0;
return len; return len;
} }
@@ -689,6 +694,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
unsigned cnt; unsigned cnt;
for (cnt = 0; fc & 0x80; cnt++) for (cnt = 0; fc & 0x80; cnt++)
fc <<= 1; fc <<= 1;
if (!cnt) if (!cnt)
{ {
// plain ASCII char // plain ASCII char
@@ -726,6 +732,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
invalid = true; invalid = true;
break; break;
} }
psz++; psz++;
res = (res << 6) | (cc & 0x3f); res = (res << 6) | (cc & 0x3f);
} }
@@ -798,6 +805,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
*buf++ = (wchar_t)( L'0' + (on % 0100) / 010 ); *buf++ = (wchar_t)( L'0' + (on % 0100) / 010 );
*buf++ = (wchar_t)( L'0' + on % 010 ); *buf++ = (wchar_t)( L'0' + on % 010 );
} }
opsz++; opsz++;
len += 4; len += 4;
} }
@@ -809,8 +817,10 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
} }
} }
} }
if (buf && (len < n)) if (buf && (len < n))
*buf = 0; *buf = 0;
return len; return len;
} }
@@ -826,12 +836,13 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
while (*psz && ((!buf) || (len < n))) while (*psz && ((!buf) || (len < n)))
{ {
wxUint32 cc; wxUint32 cc;
#ifdef WC_UTF16 #ifdef WC_UTF16
// cast is ok for WC_UTF16 // cast is ok for WC_UTF16
size_t pa = decode_utf16((const wxUint16 *)psz, cc); size_t pa = decode_utf16((const wxUint16 *)psz, cc);
psz += (pa == (size_t)-1) ? 1 : pa; psz += (pa == (size_t)-1) ? 1 : pa;
#else #else
cc=(*psz++) & 0x7fffffff; cc = (*psz++) & 0x7fffffff;
#endif #endif
if ( (m_options & MAP_INVALID_UTF8_TO_PUA) if ( (m_options & MAP_INVALID_UTF8_TO_PUA)
@@ -855,8 +866,8 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
if (buf) if (buf)
{ {
*buf++ = (char) ((psz[0] - L'0')*0100 + *buf++ = (char) ((psz[0] - L'0') * 0100 +
(psz[1] - L'0')*010 + (psz[1] - L'0') * 010 +
(psz[2] - L'0')); (psz[2] - L'0'));
} }
@@ -866,7 +877,10 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
else else
{ {
unsigned cnt; unsigned cnt;
for (cnt = 0; cc > utf8_max[cnt]; cnt++) {} for (cnt = 0; cc > utf8_max[cnt]; cnt++)
{
}
if (!cnt) if (!cnt)
{ {
// plain ASCII char // plain ASCII char
@@ -888,7 +902,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
} }
} }
if (buf && (len<n)) if (buf && (len < n))
*buf = 0; *buf = 0;
return len; return len;
@@ -912,7 +926,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// copy 16bit MB to 16bit String // copy 16bit MB to 16bit String
size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*(wxUint16*)psz && (!buf || len < n)) while (*(wxUint16*)psz && (!buf || len < n))
{ {
@@ -922,7 +936,9 @@ size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
psz += sizeof(wxUint16); psz += sizeof(wxUint16);
} }
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len; return len;
} }
@@ -931,7 +947,7 @@ size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
// copy 16bit String to 16bit MB // copy 16bit String to 16bit MB
size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*psz && (!buf || len < n)) while (*psz && (!buf || len < n))
{ {
@@ -940,10 +956,13 @@ size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
*(wxUint16*)buf = *psz; *(wxUint16*)buf = *psz;
buf += sizeof(wxUint16); buf += sizeof(wxUint16);
} }
len += sizeof(wxUint16); len += sizeof(wxUint16);
psz++; psz++;
} }
if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
if (buf && len <= n - sizeof(wxUint16))
*(wxUint16*)buf = 0;
return len; return len;
} }
@@ -987,6 +1006,7 @@ size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*buf++ = ((char*)psz)[1]; *buf++ = ((char*)psz)[1];
*buf++ = ((char*)psz)[0]; *buf++ = ((char*)psz)[0];
} }
len += 2; len += 2;
psz++; psz++;
} }
@@ -1007,12 +1027,12 @@ size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// copy 16bit MB to 32bit String // copy 16bit MB to 32bit String
size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*(wxUint16*)psz && (!buf || len < n)) while (*(wxUint16*)psz && (!buf || len < n))
{ {
wxUint32 cc; wxUint32 cc;
size_t pa=decode_utf16((wxUint16*)psz, cc); size_t pa = decode_utf16((wxUint16*)psz, cc);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return pa; return pa;
@@ -1021,7 +1041,9 @@ size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
len++; len++;
psz += pa * sizeof(wxUint16); psz += pa * sizeof(wxUint16);
} }
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len; return len;
} }
@@ -1035,7 +1057,7 @@ size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
while (*psz && (!buf || len < n)) while (*psz && (!buf || len < n))
{ {
wxUint16 cc[2]; wxUint16 cc[2];
size_t pa=encode_utf16(*psz, cc); size_t pa = encode_utf16(*psz, cc);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return pa; return pa;
@@ -1054,7 +1076,9 @@ size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
len += pa*sizeof(wxUint16); len += pa*sizeof(wxUint16);
psz++; psz++;
} }
if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
if (buf && len <= n - sizeof(wxUint16))
*(wxUint16*)buf = 0;
return len; return len;
} }
@@ -1069,10 +1093,13 @@ size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
wxUint32 cc; wxUint32 cc;
char tmp[4]; char tmp[4];
tmp[0]=psz[1]; tmp[1]=psz[0];
tmp[2]=psz[3]; tmp[3]=psz[2];
size_t pa=decode_utf16((wxUint16*)tmp, cc); tmp[0] = psz[1];
tmp[1] = psz[0];
tmp[2] = psz[3];
tmp[3] = psz[2];
size_t pa = decode_utf16((wxUint16*)tmp, cc);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return pa; return pa;
@@ -1082,7 +1109,9 @@ size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
len++; len++;
psz += pa * sizeof(wxUint16); psz += pa * sizeof(wxUint16);
} }
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len; return len;
} }
@@ -1091,12 +1120,12 @@ size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
// swap 32bit String to 16bit MB // swap 32bit String to 16bit MB
size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*psz && (!buf || len < n)) while (*psz && (!buf || len < n))
{ {
wxUint16 cc[2]; wxUint16 cc[2];
size_t pa=encode_utf16(*psz, cc); size_t pa = encode_utf16(*psz, cc);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return pa; return pa;
@@ -1112,10 +1141,12 @@ size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
} }
} }
len += pa*sizeof(wxUint16); len += pa * sizeof(wxUint16);
psz++; psz++;
} }
if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
if (buf && len <= n - sizeof(wxUint16))
*(wxUint16*)buf = 0;
return len; return len;
} }
@@ -1145,13 +1176,13 @@ WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32BE) wxConvUTF32BE;
// copy 32bit MB to 16bit String // copy 32bit MB to 16bit String
size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*(wxUint32*)psz && (!buf || len < n)) while (*(wxUint32*)psz && (!buf || len < n))
{ {
wxUint16 cc[2]; wxUint16 cc[2];
size_t pa=encode_utf16(*(wxUint32*)psz, cc); size_t pa = encode_utf16(*(wxUint32*)psz, cc);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return pa; return pa;
@@ -1161,10 +1192,13 @@ size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
if (pa > 1) if (pa > 1)
*buf++ = cc[1]; *buf++ = cc[1];
} }
len += pa; len += pa;
psz += sizeof(wxUint32); psz += sizeof(wxUint32);
} }
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len; return len;
} }
@@ -1173,7 +1207,7 @@ size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
// copy 16bit String to 32bit MB // copy 16bit String to 32bit MB
size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*psz && (!buf || len < n)) while (*psz && (!buf || len < n))
{ {
@@ -1189,33 +1223,34 @@ size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
*(wxUint32*)buf = cc; *(wxUint32*)buf = cc;
buf += sizeof(wxUint32); buf += sizeof(wxUint32);
} }
len += sizeof(wxUint32); len += sizeof(wxUint32);
psz += pa; psz += pa;
} }
if (buf && len<=n-sizeof(wxUint32)) if (buf && len <= n - sizeof(wxUint32))
*(wxUint32*)buf=0; *(wxUint32*)buf = 0;
return len; return len;
} }
// swap 32bit MB to 16bit String // swap 32bit MB to 16bit String
size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*(wxUint32*)psz && (!buf || len < n)) while (*(wxUint32*)psz && (!buf || len < n))
{ {
char tmp[4]; char tmp[4];
tmp[0] = psz[3]; tmp[1] = psz[2]; tmp[0] = psz[3];
tmp[2] = psz[1]; tmp[3] = psz[0]; tmp[1] = psz[2];
tmp[2] = psz[1];
tmp[3] = psz[0];
wxUint16 cc[2]; wxUint16 cc[2];
size_t pa=encode_utf16(*(wxUint32*)tmp, cc); size_t pa = encode_utf16(*(wxUint32*)tmp, cc);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return pa; return pa;
@@ -1225,12 +1260,13 @@ size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
if (pa > 1) if (pa > 1)
*buf++ = cc[1]; *buf++ = cc[1];
} }
len += pa; len += pa;
psz += sizeof(wxUint32); psz += sizeof(wxUint32);
} }
if (buf && len<n) if (buf && len < n)
*buf=0; *buf = 0;
return len; return len;
} }
@@ -1239,14 +1275,14 @@ size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
// swap 16bit String to 32bit MB // swap 16bit String to 32bit MB
size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*psz && (!buf || len < n)) while (*psz && (!buf || len < n))
{ {
char cc[4]; char cc[4];
// cast is ok for WC_UTF16 // cast is ok for WC_UTF16
size_t pa=decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc); size_t pa = decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return pa; return pa;
@@ -1257,12 +1293,13 @@ size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*buf++ = cc[1]; *buf++ = cc[1];
*buf++ = cc[0]; *buf++ = cc[0];
} }
len += sizeof(wxUint32); len += sizeof(wxUint32);
psz += pa; psz += pa;
} }
if (buf && len<=n-sizeof(wxUint32)) if (buf && len <= n - sizeof(wxUint32))
*(wxUint32*)buf=0; *(wxUint32*)buf = 0;
return len; return len;
} }
@@ -1283,8 +1320,8 @@ size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
psz += sizeof(wxUint32); psz += sizeof(wxUint32);
} }
if (buf && len<n) if (buf && len < n)
*buf=0; *buf = 0;
return len; return len;
} }
@@ -1293,7 +1330,7 @@ size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
// copy 32bit String to 32bit MB // copy 32bit String to 32bit MB
size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*psz && (!buf || len < n)) while (*psz && (!buf || len < n))
{ {
@@ -1307,8 +1344,8 @@ size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
psz++; psz++;
} }
if (buf && len<=n-sizeof(wxUint32)) if (buf && len <= n - sizeof(wxUint32))
*(wxUint32*)buf=0; *(wxUint32*)buf = 0;
return len; return len;
} }
@@ -1317,7 +1354,7 @@ size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
// swap 32bit MB to 32bit String // swap 32bit MB to 32bit String
size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*(wxUint32*)psz && (!buf || len < n)) while (*(wxUint32*)psz && (!buf || len < n))
{ {
@@ -1329,12 +1366,13 @@ size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
((char *)buf)[3] = psz[0]; ((char *)buf)[3] = psz[0];
buf++; buf++;
} }
len++; len++;
psz += sizeof(wxUint32); psz += sizeof(wxUint32);
} }
if (buf && len<n) if (buf && len < n)
*buf=0; *buf = 0;
return len; return len;
} }
@@ -1343,7 +1381,7 @@ size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
// swap 32bit String to 32bit MB // swap 32bit String to 32bit MB
size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*psz && (!buf || len < n)) while (*psz && (!buf || len < n))
{ {
@@ -1354,12 +1392,13 @@ size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*buf++ = ((char *)psz)[1]; *buf++ = ((char *)psz)[1];
*buf++ = ((char *)psz)[0]; *buf++ = ((char *)psz)[0];
} }
len += sizeof(wxUint32); len += sizeof(wxUint32);
psz++; psz++;
} }
if (buf && len<=n-sizeof(wxUint32)) if (buf && len <= n - sizeof(wxUint32))
*(wxUint32*)buf=0; *(wxUint32*)buf = 0;
return len; return len;
} }
@@ -1435,6 +1474,7 @@ protected:
// the other direction // the other direction
iconv_t m2w, iconv_t m2w,
w2m; w2m;
#if wxUSE_THREADS #if wxUSE_THREADS
// guards access to m2w and w2m objects // guards access to m2w and w2m objects
wxMutex m_iconvMutex; wxMutex m_iconvMutex;
@@ -1467,6 +1507,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
delete result; delete result;
return 0; return 0;
} }
return result; return result;
} }
@@ -1635,7 +1676,6 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex); wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
#endif // wxUSE_THREADS #endif // wxUSE_THREADS
size_t outbuf = n * SIZEOF_WCHAR_T; size_t outbuf = n * SIZEOF_WCHAR_T;
size_t res, cres; size_t res, cres;
// VS: Use these instead of psz, buf because iconv() modifies its arguments: // VS: Use these instead of psz, buf because iconv() modifies its arguments:
@@ -1667,16 +1707,19 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
// to calculate destination buffer requirement // to calculate destination buffer requirement
wchar_t tbuf[8]; wchar_t tbuf[8];
res = 0; res = 0;
do {
do
{
bufPtr = tbuf; bufPtr = tbuf;
outbuf = 8*SIZEOF_WCHAR_T; outbuf = 8 * SIZEOF_WCHAR_T;
cres = iconv(m2w, cres = iconv(m2w,
ICONV_CHAR_CAST(&pszPtr), &inbuf, ICONV_CHAR_CAST(&pszPtr), &inbuf,
(char**)&bufPtr, &outbuf ); (char**)&bufPtr, &outbuf );
res += 8-(outbuf/SIZEOF_WCHAR_T); res += 8 - (outbuf / SIZEOF_WCHAR_T);
} while ((cres==(size_t)-1) && (errno==E2BIG)); }
while ((cres == (size_t)-1) && (errno == E2BIG));
} }
if (ICONV_FAILED(cres, inbuf)) if (ICONV_FAILED(cres, inbuf))
@@ -1711,6 +1754,7 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T); tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T);
for ( size_t i = 0; i < inlen; i++ ) for ( size_t i = 0; i < inlen; i++ )
tmpbuf[n] = WC_BSWAP(psz[i]); tmpbuf[n] = WC_BSWAP(psz[i]);
tmpbuf[inlen] = L'\0'; tmpbuf[inlen] = L'\0';
psz = tmpbuf; psz = tmpbuf;
} }
@@ -1720,7 +1764,7 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// have destination buffer, convert there // have destination buffer, convert there
cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf ); cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
res = n-outbuf; res = n - outbuf;
// NB: iconv was given only wcslen(psz) characters on input, and so // NB: iconv was given only wcslen(psz) characters on input, and so
// it couldn't convert the trailing zero. Let's do it ourselves // it couldn't convert the trailing zero. Let's do it ourselves
@@ -1734,13 +1778,16 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// to calculate destination buffer requirement // to calculate destination buffer requirement
char tbuf[16]; char tbuf[16];
res = 0; res = 0;
do { do
buf = tbuf; outbuf = 16; {
buf = tbuf;
outbuf = 16;
cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf ); cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
res += 16 - outbuf; res += 16 - outbuf;
} while ((cres==(size_t)-1) && (errno==E2BIG)); }
while ((cres == (size_t)-1) && (errno == E2BIG));
} }
if (ms_wcNeedsSwap) if (ms_wcNeedsSwap)
@@ -1772,15 +1819,15 @@ size_t wxMBConv_iconv::GetMBNulLen() const
char buf[8]; // should be enough for NUL in any encoding char buf[8]; // should be enough for NUL in any encoding
size_t inLen = sizeof(wchar_t), size_t inLen = sizeof(wchar_t),
outLen = WXSIZEOF(buf); outLen = WXSIZEOF(buf);
char *in = (char *)wnul; char *inBuff = (char *)wnul;
char *out = buf; char *outBuff = buf;
if ( iconv(w2m, ICONV_CHAR_CAST(&in), &inLen, &out, &outLen) == (size_t)-1 ) if ( iconv(w2m, ICONV_CHAR_CAST(&inBuff), &inLen, &outBuff, &outLen) == (size_t)-1 )
{ {
self->m_minMBCharWidth = (size_t)-1; self->m_minMBCharWidth = (size_t)-1;
} }
else // ok else // ok
{ {
self->m_minMBCharWidth = out - buf; self->m_minMBCharWidth = outBuff - buf;
} }
} }
@@ -2009,7 +2056,8 @@ public:
{ {
default: default:
wxLogDebug(_T("Unexpected NUL length %d"), len); wxLogDebug(_T("Unexpected NUL length %d"), len);
// fall through self->m_minMBCharWidth = (size_t)-1;
break;
case 0: case 0:
self->m_minMBCharWidth = (size_t)-1; self->m_minMBCharWidth = (size_t)-1;
@@ -2049,8 +2097,9 @@ private:
break; break;
default: default:
// unknown, be conseravtive by default // unknown, be conservative by default
s_isWin98Or2k = 0; s_isWin98Or2k = 0;
break;
} }
wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") ); wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") );
@@ -2103,8 +2152,8 @@ private:
#if defined(__WXCOCOA__) #if defined(__WXCOCOA__)
// RN: There is no UTF-32 support in either Core Foundation or // RN: There is no UTF-32 support in either Core Foundation or Cocoa.
// Cocoa. Strangely enough, internally Core Foundation uses // Strangely enough, internally Core Foundation uses
// UTF 32 internally quite a bit - its just not public (yet). // UTF 32 internally quite a bit - its just not public (yet).
#include <CoreFoundation/CFString.h> #include <CoreFoundation/CFString.h>
@@ -2113,12 +2162,13 @@ private:
CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding) CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
{ {
CFStringEncoding enc = kCFStringEncodingInvalidId ; CFStringEncoding enc = kCFStringEncodingInvalidId ;
if ( encoding == wxFONTENCODING_DEFAULT )
switch (encoding)
{ {
case wxFONTENCODING_DEFAULT :
enc = CFStringGetSystemEncoding(); enc = CFStringGetSystemEncoding();
} break ;
else switch( encoding)
{
case wxFONTENCODING_ISO8859_1 : case wxFONTENCODING_ISO8859_1 :
enc = kCFStringEncodingISOLatin1 ; enc = kCFStringEncodingISOLatin1 ;
break ; break ;
@@ -2174,7 +2224,7 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
// break ; // break ;
case wxFONTENCODING_CP437 : case wxFONTENCODING_CP437 :
enc =kCFStringEncodingDOSLatinUS ; enc = kCFStringEncodingDOSLatinUS ;
break ; break ;
case wxFONTENCODING_CP850 : case wxFONTENCODING_CP850 :
enc = kCFStringEncodingDOSLatin1; enc = kCFStringEncodingDOSLatin1;
@@ -2186,7 +2236,7 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
enc = kCFStringEncodingDOSCyrillic; enc = kCFStringEncodingDOSCyrillic;
break ; break ;
case wxFONTENCODING_CP866 : case wxFONTENCODING_CP866 :
enc =kCFStringEncodingDOSRussian ; enc = kCFStringEncodingDOSRussian ;
break ; break ;
case wxFONTENCODING_CP874 : case wxFONTENCODING_CP874 :
enc = kCFStringEncodingDOSThai; enc = kCFStringEncodingDOSThai;
@@ -2195,7 +2245,7 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
enc = kCFStringEncodingDOSJapanese; enc = kCFStringEncodingDOSJapanese;
break ; break ;
case wxFONTENCODING_CP936 : case wxFONTENCODING_CP936 :
enc =kCFStringEncodingDOSChineseSimplif ; enc = kCFStringEncodingDOSChineseSimplif ;
break ; break ;
case wxFONTENCODING_CP949 : case wxFONTENCODING_CP949 :
enc = kCFStringEncodingDOSKorean; enc = kCFStringEncodingDOSKorean;
@@ -2207,10 +2257,10 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
enc = kCFStringEncodingWindowsLatin2; enc = kCFStringEncodingWindowsLatin2;
break ; break ;
case wxFONTENCODING_CP1251 : case wxFONTENCODING_CP1251 :
enc =kCFStringEncodingWindowsCyrillic ; enc = kCFStringEncodingWindowsCyrillic ;
break ; break ;
case wxFONTENCODING_CP1252 : case wxFONTENCODING_CP1252 :
enc =kCFStringEncodingWindowsLatin1 ; enc = kCFStringEncodingWindowsLatin1 ;
break ; break ;
case wxFONTENCODING_CP1253 : case wxFONTENCODING_CP1253 :
enc = kCFStringEncodingWindowsGreek; enc = kCFStringEncodingWindowsGreek;
@@ -2219,10 +2269,10 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
enc = kCFStringEncodingWindowsLatin5; enc = kCFStringEncodingWindowsLatin5;
break ; break ;
case wxFONTENCODING_CP1255 : case wxFONTENCODING_CP1255 :
enc =kCFStringEncodingWindowsHebrew ; enc = kCFStringEncodingWindowsHebrew ;
break ; break ;
case wxFONTENCODING_CP1256 : case wxFONTENCODING_CP1256 :
enc =kCFStringEncodingWindowsArabic ; enc = kCFStringEncodingWindowsArabic ;
break ; break ;
case wxFONTENCODING_CP1257 : case wxFONTENCODING_CP1257 :
enc = kCFStringEncodingWindowsBalticRim; enc = kCFStringEncodingWindowsBalticRim;
@@ -2360,10 +2410,12 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
// case wxFONTENCODING_MACKEYBOARD : // case wxFONTENCODING_MACKEYBOARD :
// enc = kCFStringEncodingMacKeyboardGlyphs ; // enc = kCFStringEncodingMacKeyboardGlyphs ;
// break ; // break ;
default : default :
// because gcc is picky // because gcc is picky
break ; break ;
} ; }
return enc ; return enc ;
} }
@@ -2538,7 +2590,7 @@ public:
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxMBConv_mac(const wxChar* name) wxMBConv_mac(const wxChar* name)
{ {
Init( wxMacGetSystemEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ; Init( wxMacGetSystemEncFromFontEnc( wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
} }
#endif #endif
@@ -2559,7 +2611,7 @@ public:
{ {
OSStatus status = noErr ; OSStatus status = noErr ;
m_char_encoding = encoding ; m_char_encoding = encoding ;
m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ; m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, 0, kUnicode16BitFormat) ;
status = TECCreateConverter(&m_MB2WC_converter, status = TECCreateConverter(&m_MB2WC_converter,
m_char_encoding, m_char_encoding,
@@ -2584,7 +2636,9 @@ public:
n = wxMax( 32 , byteInLen ) ; n = wxMax( 32 , byteInLen ) ;
tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ; tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ;
} }
ByteCount byteBufferLen = n * sizeof( UniChar ) ; ByteCount byteBufferLen = n * sizeof( UniChar ) ;
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ; ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
#else #else
@@ -2602,6 +2656,7 @@ public:
#else #else
res = byteOutLen / sizeof( UniChar ) ; res = byteOutLen / sizeof( UniChar ) ;
#endif #endif
if ( buf == NULL ) if ( buf == NULL )
free(tbuf) ; free(tbuf) ;
@@ -2628,6 +2683,7 @@ public:
ByteCount byteBufferLen = n ; ByteCount byteBufferLen = n ;
UniChar* ubuf = NULL ; UniChar* ubuf = NULL ;
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
wxMBConvUTF16 converter ; wxMBConvUTF16 converter ;
size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ; size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ;
@@ -2637,11 +2693,15 @@ public:
#else #else
ubuf = (UniChar*) psz ; ubuf = (UniChar*) psz ;
#endif #endif
status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) ubuf , byteInLen, &byteInLen,
(TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen); status = TECConvertText(
m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen,
(TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
free( ubuf ) ; free( ubuf ) ;
#endif #endif
if ( buf == NULL ) if ( buf == NULL )
free(tbuf) ; free(tbuf) ;
@@ -2670,14 +2730,14 @@ public:
virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); } virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); }
bool IsOk() const bool IsOk() const
{ return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL ; } { return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; }
private: private:
TECObjectRef m_MB2WC_converter ; TECObjectRef m_MB2WC_converter;
TECObjectRef m_WC2MB_converter ; TECObjectRef m_WC2MB_converter;
TextEncodingBase m_char_encoding ; TextEncodingBase m_char_encoding;
TextEncodingBase m_unicode_encoding ; TextEncodingBase m_unicode_encoding;
}; };
#endif // defined(__WXMAC__) && defined(TARGET_CARBON) #endif // defined(__WXMAC__) && defined(TARGET_CARBON)
@@ -2722,7 +2782,7 @@ public:
size_t inbuf = strlen(psz); size_t inbuf = strlen(psz);
if (buf) if (buf)
{ {
if (!m2w.Convert(psz,buf)) if (!m2w.Convert(psz, buf))
return (size_t)-1; return (size_t)-1;
} }
return inbuf; return inbuf;
@@ -2733,7 +2793,7 @@ public:
const size_t inbuf = wxWcslen(psz); const size_t inbuf = wxWcslen(psz);
if (buf) if (buf)
{ {
if (!w2m.Convert(psz,buf)) if (!w2m.Convert(psz, buf))
return (size_t)-1; return (size_t)-1;
} }
@@ -2781,6 +2841,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const wxChar* name )
delete result; delete result;
return 0; return 0;
} }
return result; return result;
} }
@@ -2976,13 +3037,13 @@ wxMBConv *wxCSConv::DoCreate() const
#endif #endif
} }
#endif // wxHAVE_WIN32_MB2WC #endif // wxHAVE_WIN32_MB2WC
#if defined(__WXMAC__) #if defined(__WXMAC__)
{ {
// leave UTF16 and UTF32 to the built-ins of wx // leave UTF16 and UTF32 to the built-ins of wx
if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE || if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) ) ( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
{ {
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name) wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
: new wxMBConv_mac(m_encoding); : new wxMBConv_mac(m_encoding);
@@ -2996,17 +3057,18 @@ wxMBConv *wxCSConv::DoCreate() const
} }
} }
#endif #endif
#if defined(__WXCOCOA__) #if defined(__WXCOCOA__)
{ {
if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) ) if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
{ {
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name) wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
: new wxMBConv_cocoa(m_encoding); : new wxMBConv_cocoa(m_encoding);
#else #else
wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding); wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding);
#endif #endif
if ( conv->IsOk() ) if ( conv->IsOk() )
return conv; return conv;
@@ -3048,7 +3110,7 @@ wxMBConv *wxCSConv::DoCreate() const
default: default:
// nothing to do but put here to suppress gcc warnings // nothing to do but put here to suppress gcc warnings
; break;
} }
// step (3) // step (3)
@@ -3083,6 +3145,7 @@ wxMBConv *wxCSConv::DoCreate() const
wxString::Format(_("encoding %s"), m_encoding).c_str() wxString::Format(_("encoding %s"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
); );
alreadyLoggingError = false; alreadyLoggingError = false;
} }
@@ -3143,6 +3206,7 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
if (psz[c] > 0xFF) if (psz[c] > 0xFF)
return (size_t)-1; return (size_t)-1;
buf[c] = (char)psz[c]; buf[c] = (char)psz[c];
} }
} }