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

cleanup (repeat of v197) - 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@38592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-04-06 02:30:52 +00:00
parent 0cdd86d6d0
commit ef1991645a
1 changed files with 199 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
src/common/strconv.cpp
View File

@@ -12,25 +12,13 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#endif // WX_PRECOMP #endif
#include "wx/strconv.h" #include "wx/strconv.h"
@@ -51,7 +39,7 @@
#if defined(__WIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__WXMICROWIN__)
#define wxHAVE_WIN32_MB2WC #define wxHAVE_WIN32_MB2WC
#endif // __WIN32__ but !__WXMICROWIN__ #endif
#ifdef __SALFORDC__ #ifdef __SALFORDC__
#include <clib.h> #include <clib.h>
@@ -73,9 +61,11 @@
#include <TextEncodingConverter.h> #include <TextEncodingConverter.h>
#endif #endif
#include "wx/mac/private.h" // includes mac headers // includes Mac headers
#include "wx/mac/private.h"
#endif #endif
#define TRACE_STRCONV _T("strconv") #define TRACE_STRCONV _T("strconv")
// WC_UTF16 is defined only if sizeof(wchar_t) == 2, otherwise it's supposed to // WC_UTF16 is defined only if sizeof(wchar_t) == 2, otherwise it's supposed to
@@ -84,6 +74,7 @@
#define WC_UTF16 #define WC_UTF16
#endif #endif
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================
@@ -107,6 +98,7 @@ static size_t encode_utf16(wxUint32 input, wxUint16 *output)
{ {
if (output) if (output)
*output = (wxUint16) input; *output = (wxUint16) input;
return 1; return 1;
} }
else if (input >= 0x110000) else if (input >= 0x110000)
@@ -120,6 +112,7 @@ static size_t encode_utf16(wxUint32 input, wxUint16 *output)
*output++ = (wxUint16) ((input >> 10) + 0xd7c0); *output++ = (wxUint16) ((input >> 10) + 0xd7c0);
*output = (wxUint16) ((input & 0x3ff) + 0xdc00); *output = (wxUint16) ((input & 0x3ff) + 0xdc00);
} }
return 2; return 2;
} }
} }
@@ -331,9 +324,9 @@ 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 != wxCONV_FAILED )
{ {
// ToWChar() returns the buffer length, i.e. including the trailing // ToWChar() returns the buffer length, i.e. including the trailing
@@ -344,9 +337,9 @@ 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 != wxCONV_FAILED )
{ {
rc -= GetMBNulLen(); rc -= GetMBNulLen();
@@ -400,13 +393,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 != wxCONV_FAILED )
{ {
wxWCharBuffer wbuf(dstLen - 1); wxWCharBuffer wbuf(dstLen - 1);
if ( ToWChar(wbuf.data(), dstLen, in, inLen) != wxCONV_FAILED ) if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
{ {
if ( outLen ) if ( outLen )
{ {
@@ -426,13 +419,13 @@ 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 != wxCONV_FAILED )
{ {
wxCharBuffer buf(dstLen - 1); wxCharBuffer buf(dstLen - 1);
if ( FromWChar(buf.data(), dstLen, in, inLen) != wxCONV_FAILED ) if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
{ {
if ( outLen ) if ( outLen )
{ {
@@ -648,6 +641,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
@@ -661,6 +655,7 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
if (buf) if (buf)
*buf++ = '+'; *buf++ = '+';
len++; len++;
if (cc != '+') if (cc != '+')
{ {
@@ -681,24 +676,30 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
len++; len++;
} }
} }
cc = *psz; cc = *psz;
if (!(cc) || (cc < 0x80 && utf7encode[cc] < 1)) if (!(cc) || (cc < 0x80 && utf7encode[cc] < 1))
break; break;
} }
if (l != 0) if (l != 0)
{ {
if (buf) if (buf)
*buf++ = utf7enb64[((d % 16) << (6 - l)) % 64]; *buf++ = utf7enb64[((d % 16) << (6 - l)) % 64];
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;
} }
@@ -726,6 +727,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
@@ -763,9 +765,11 @@ 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);
} }
if (invalid || res <= utf8_max[ocnt]) if (invalid || res <= utf8_max[ocnt])
{ {
// illegal UTF-8 encoding // illegal UTF-8 encoding
@@ -801,6 +805,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
#endif // WC_UTF16/!WC_UTF16 #endif // WC_UTF16/!WC_UTF16
} }
} }
if (invalid) if (invalid)
{ {
if (m_options & MAP_INVALID_UTF8_TO_PUA) if (m_options & MAP_INVALID_UTF8_TO_PUA)
@@ -835,6 +840,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;
} }
@@ -846,8 +852,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;
} }
@@ -863,6 +871,7 @@ 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);
@@ -903,7 +912,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
@@ -911,7 +923,6 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*buf++ = (char) cc; *buf++ = (char) cc;
len++; len++;
} }
else else
{ {
len += cnt + 1; len += cnt + 1;
@@ -949,8 +960,8 @@ size_t wxMBConvUTF16Base::GetLength(const char *src, size_t srcLen)
if ( srcLen == wxNO_LEN ) if ( srcLen == wxNO_LEN )
{ {
// count the number of bytes in input, including the trailing NULs // count the number of bytes in input, including the trailing NULs
const wxUint16 *in = wx_reinterpret_cast(const wxUint16 *, src); const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
for ( srcLen = 1; *in++; srcLen++ ) for ( srcLen = 1; *inBuff++; srcLen++ )
; ;
srcLen *= BYTES_PER_CHAR; srcLen *= BYTES_PER_CHAR;
@@ -1033,10 +1044,10 @@ wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
if ( dstLen < srcLen ) if ( dstLen < srcLen )
return wxCONV_FAILED; return wxCONV_FAILED;
const wxUint16 *in = wx_reinterpret_cast(const wxUint16 *, src); const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
for ( size_t n = 0; n < srcLen; n++, in++ ) for ( size_t n = 0; n < srcLen; n++, inBuff++ )
{ {
*dst++ = wxUINT16_SWAP_ALWAYS(*in); *dst++ = wxUINT16_SWAP_ALWAYS(*inBuff);
} }
} }
@@ -1057,10 +1068,10 @@ wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
if ( dstLen < srcLen ) if ( dstLen < srcLen )
return wxCONV_FAILED; return wxCONV_FAILED;
wxUint16 *out = wx_reinterpret_cast(wxUint16 *, dst); wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ ) for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )
{ {
*out++ = wxUINT16_SWAP_ALWAYS(*src); *outBuff++ = wxUINT16_SWAP_ALWAYS(*src);
} }
} }
@@ -1091,11 +1102,11 @@ wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen,
} }
size_t outLen = 0; size_t outLen = 0;
const wxUint16 *in = wx_reinterpret_cast(const wxUint16 *, src); const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
for ( const wxUint16 * const inEnd = in + inLen; in < inEnd; ) for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
{ {
const wxUint32 ch = wxDecodeSurrogate(&in); const wxUint32 ch = wxDecodeSurrogate(&inBuff);
if ( !in ) if ( !inBuff )
return wxCONV_FAILED; return wxCONV_FAILED;
if ( ++outLen > dstLen ) if ( ++outLen > dstLen )
@@ -1116,7 +1127,7 @@ wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
srcLen = wxWcslen(src) + 1; srcLen = wxWcslen(src) + 1;
size_t outLen = 0; size_t outLen = 0;
wxUint16 *out = wx_reinterpret_cast(wxUint16 *, dst); wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
for ( size_t n = 0; n < srcLen; n++ ) for ( size_t n = 0; n < srcLen; n++ )
{ {
wxUint16 cc[2]; wxUint16 cc[2];
@@ -1125,16 +1136,16 @@ wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
return wxCONV_FAILED; return wxCONV_FAILED;
outLen += numChars * BYTES_PER_CHAR; outLen += numChars * BYTES_PER_CHAR;
if ( out ) if ( outBuff )
{ {
if ( outLen > dstLen ) if ( outLen > dstLen )
return wxCONV_FAILED; return wxCONV_FAILED;
*out++ = cc[0]; *outBuff++ = cc[0];
if ( numChars == 2 ) if ( numChars == 2 )
{ {
// second character of a surrogate // second character of a surrogate
*out++ = cc[1]; *outBuff++ = cc[1];
} }
} }
} }
@@ -1164,21 +1175,22 @@ wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
} }
size_t outLen = 0; size_t outLen = 0;
const wxUint16 *in = wx_reinterpret_cast(const wxUint16 *, src); const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
for ( const wxUint16 * const inEnd = in + inLen; in < inEnd; ) for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
{ {
wxUint32 ch; wxUint32 ch;
wxUint16 tmp[2]; wxUint16 tmp[2];
tmp[0] = wxUINT16_SWAP_ALWAYS(*in);
in++; tmp[0] = wxUINT16_SWAP_ALWAYS(*inBuff);
tmp[1] = wxUINT16_SWAP_ALWAYS(*in); inBuff++;
tmp[1] = wxUINT16_SWAP_ALWAYS(*inBuff);
const size_t numChars = decode_utf16(tmp, ch); const size_t numChars = decode_utf16(tmp, ch);
if ( numChars == wxCONV_FAILED ) if ( numChars == wxCONV_FAILED )
return wxCONV_FAILED; return wxCONV_FAILED;
if ( numChars == 2 ) if ( numChars == 2 )
in++; inBuff++;
if ( ++outLen > dstLen ) if ( ++outLen > dstLen )
return wxCONV_FAILED; return wxCONV_FAILED;
@@ -1198,7 +1210,7 @@ wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
srcLen = wxWcslen(src) + 1; srcLen = wxWcslen(src) + 1;
size_t outLen = 0; size_t outLen = 0;
wxUint16 *out = wx_reinterpret_cast(wxUint16 *, dst); wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ ) for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ )
{ {
wxUint16 cc[2]; wxUint16 cc[2];
@@ -1207,16 +1219,16 @@ wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
return wxCONV_FAILED; return wxCONV_FAILED;
outLen += numChars * BYTES_PER_CHAR; outLen += numChars * BYTES_PER_CHAR;
if ( out ) if ( outBuff )
{ {
if ( outLen > dstLen ) if ( outLen > dstLen )
return wxCONV_FAILED; return wxCONV_FAILED;
*out++ = wxUINT16_SWAP_ALWAYS(cc[0]); *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[0]);
if ( numChars == 2 ) if ( numChars == 2 )
{ {
// second character of a surrogate // second character of a surrogate
*out++ = wxUINT16_SWAP_ALWAYS(cc[1]); *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[1]);
} }
} }
} }
@@ -1249,8 +1261,8 @@ size_t wxMBConvUTF32Base::GetLength(const char *src, size_t srcLen)
if ( srcLen == wxNO_LEN ) if ( srcLen == wxNO_LEN )
{ {
// count the number of bytes in input, including the trailing NULs // count the number of bytes in input, including the trailing NULs
const wxUint32 *in = wx_reinterpret_cast(const wxUint32 *, src); const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
for ( srcLen = 1; *in++; srcLen++ ) for ( srcLen = 1; *inBuff++; srcLen++ )
; ;
srcLen *= BYTES_PER_CHAR; srcLen *= BYTES_PER_CHAR;
@@ -1280,13 +1292,13 @@ wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen,
if ( srcLen == wxNO_LEN ) if ( srcLen == wxNO_LEN )
return wxCONV_FAILED; return wxCONV_FAILED;
const wxUint32 *in = wx_reinterpret_cast(const wxUint32 *, src); const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
const size_t inLen = srcLen / BYTES_PER_CHAR; const size_t inLen = srcLen / BYTES_PER_CHAR;
size_t outLen = 0; size_t outLen = 0;
for ( size_t n = 0; n < inLen; n++ ) for ( size_t n = 0; n < inLen; n++ )
{ {
wxUint16 cc[2]; wxUint16 cc[2];
const size_t numChars = encode_utf16(*in++, cc); const size_t numChars = encode_utf16(*inBuff++, cc);
if ( numChars == wxCONV_FAILED ) if ( numChars == wxCONV_FAILED )
return wxCONV_FAILED; return wxCONV_FAILED;
@@ -1327,7 +1339,7 @@ wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
return srcLen * BYTES_PER_CHAR; return srcLen * BYTES_PER_CHAR;
} }
wxUint32 *out = wx_reinterpret_cast(wxUint32 *, dst); wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
size_t outLen = 0; size_t outLen = 0;
for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; ) for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
{ {
@@ -1340,7 +1352,7 @@ wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
if ( outLen > dstLen ) if ( outLen > dstLen )
return wxCONV_FAILED; return wxCONV_FAILED;
*out++ = ch; *outBuff++ = ch;
} }
return outLen; return outLen;
@@ -1358,13 +1370,13 @@ wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
if ( srcLen == wxNO_LEN ) if ( srcLen == wxNO_LEN )
return wxCONV_FAILED; return wxCONV_FAILED;
const wxUint32 *in = wx_reinterpret_cast(const wxUint32 *, src); const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
const size_t inLen = srcLen / BYTES_PER_CHAR; const size_t inLen = srcLen / BYTES_PER_CHAR;
size_t outLen = 0; size_t outLen = 0;
for ( size_t n = 0; n < inLen; n++, in++ ) for ( size_t n = 0; n < inLen; n++, inBuff++ )
{ {
wxUint16 cc[2]; wxUint16 cc[2];
const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*in), cc); const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*inBuff), cc);
if ( numChars == wxCONV_FAILED ) if ( numChars == wxCONV_FAILED )
return wxCONV_FAILED; return wxCONV_FAILED;
@@ -1405,7 +1417,7 @@ wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
return srcLen*BYTES_PER_CHAR; return srcLen*BYTES_PER_CHAR;
} }
wxUint32 *out = wx_reinterpret_cast(wxUint32 *, dst); wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
size_t outLen = 0; size_t outLen = 0;
for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; ) for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
{ {
@@ -1418,7 +1430,7 @@ wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
if ( outLen > dstLen ) if ( outLen > dstLen )
return wxCONV_FAILED; return wxCONV_FAILED;
*out++ = wxUINT32_SWAP_ALWAYS(ch); *outBuff++ = wxUINT32_SWAP_ALWAYS(ch);
} }
return outLen; return outLen;
@@ -1490,10 +1502,10 @@ wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
if ( dstLen < srcLen ) if ( dstLen < srcLen )
return wxCONV_FAILED; return wxCONV_FAILED;
const wxUint32 *in = wx_reinterpret_cast(const wxUint32 *, src); const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
for ( size_t n = 0; n < srcLen; n++, in++ ) for ( size_t n = 0; n < srcLen; n++, inBuff++ )
{ {
*dst++ = wxUINT32_SWAP_ALWAYS(*in); *dst++ = wxUINT32_SWAP_ALWAYS(*inBuff);
} }
} }
@@ -1514,10 +1526,10 @@ wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
if ( dstLen < srcLen ) if ( dstLen < srcLen )
return wxCONV_FAILED; return wxCONV_FAILED;
wxUint32 *out = wx_reinterpret_cast(wxUint32 *, dst); wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ ) for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )
{ {
*out++ = wxUINT32_SWAP_ALWAYS(*src); *outBuff++ = wxUINT32_SWAP_ALWAYS(*src);
} }
} }
@@ -1590,10 +1602,11 @@ public:
{ return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); } { return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); }
protected: protected:
// the iconv handlers used to translate from multibyte to wide char and in // the iconv handlers used to translate from multibyte
// the other direction // to wide char and in 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;
@@ -1626,6 +1639,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
delete result; delete result;
return 0; return 0;
} }
return result; return result;
} }
@@ -1666,6 +1680,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
// first try charset with explicit bytesex info (e.g. "UCS-4LE"): // first try charset with explicit bytesex info (e.g. "UCS-4LE"):
wxString nameXE(nameCS); wxString nameXE(nameCS);
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
nameXE += _T("BE"); nameXE += _T("BE");
#else // little endian #else // little endian
@@ -1699,7 +1714,8 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
wbufPtr = wbuf; wbufPtr = wbuf;
bufPtr = buf; bufPtr = buf;
res = iconv(m2w, ICONV_CHAR_CAST(&bufPtr), &insz, res = iconv(
m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
(char**)&wbufPtr, &outsz); (char**)&wbufPtr, &outsz);
if (ICONV_FAILED(res, insz)) if (ICONV_FAILED(res, insz))
@@ -1794,7 +1810,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:
@@ -1826,7 +1841,9 @@ 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;
@@ -1835,7 +1852,8 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
(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))
@@ -1870,6 +1888,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;
} }
@@ -1889,17 +1908,20 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
} }
else else
{ {
// no destination buffer... convert using temp buffer // no destination buffer: convert using temp buffer
// 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)
@@ -1931,15 +1953,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;
} }
} }
@@ -2168,7 +2190,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;
@@ -2208,8 +2231,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") );
@@ -2262,9 +2286,9 @@ 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>
#include <CoreFoundation/CFStringEncodingExt.h> #include <CoreFoundation/CFStringEncodingExt.h>
@@ -2272,12 +2296,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 ;
@@ -2519,10 +2544,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 ;
} }
@@ -2739,18 +2766,23 @@ public:
if (buf == NULL) if (buf == NULL)
{ {
//apple specs say at least 32 // Apple specs say at least 32
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
ubuf = (UniChar*) (buf ? buf : tbuf) ; ubuf = (UniChar*) (buf ? buf : tbuf) ;
#endif #endif
status = TECConvertText(m_MB2WC_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
status = TECConvertText(
m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
(TextPtr) ubuf, byteBufferLen, &byteOutLen); (TextPtr) ubuf, byteBufferLen, &byteOutLen);
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
// we have to terminate here, because n might be larger for the trailing zero, and if UniChar // we have to terminate here, because n might be larger for the trailing zero, and if UniChar
// is not properly terminated we get random characters at the end // is not properly terminated we get random characters at the end
@@ -2761,6 +2793,7 @@ public:
#else #else
res = byteOutLen / sizeof( UniChar ) ; res = byteOutLen / sizeof( UniChar ) ;
#endif #endif
if ( buf == NULL ) if ( buf == NULL )
free(tbuf) ; free(tbuf) ;
@@ -2780,13 +2813,14 @@ public:
if (buf == NULL) if (buf == NULL)
{ {
//apple specs say at least 32 // Apple specs say at least 32
n = wxMax( 32, ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T ); n = wxMax( 32, ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T );
tbuf = (char*) malloc( n ) ; tbuf = (char*) malloc( n ) ;
} }
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 ) ;
@@ -2796,11 +2830,15 @@ public:
#else #else
ubuf = (UniChar*) psz ; ubuf = (UniChar*) psz ;
#endif #endif
status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) ubuf , byteInLen, &byteInLen,
status = TECConvertText(
m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen,
(TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen); (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) ;
@@ -2940,6 +2978,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const wxChar* name )
delete result; delete result;
return 0; return 0;
} }
return result; return result;
} }
@@ -3135,13 +3174,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);
@@ -3155,17 +3194,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;
@@ -3207,7 +3247,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)
@@ -3242,6 +3282,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;
} }
@@ -3302,6 +3343,7 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
if (psz[c] > 0xFF) if (psz[c] > 0xFF)
return wxCONV_FAILED; return wxCONV_FAILED;
buf[c] = (char)psz[c]; buf[c] = (char)psz[c];
} }
} }