{
if (input<=0xffff)
{
- if (output) *output++ = (wxUint16) input;
+ if (output)
+ *output = (wxUint16) input;
return 1;
}
else if (input>=0x110000)
if (output)
{
*output++ = (wxUint16) ((input >> 10)+0xd7c0);
- *output++ = (wxUint16) ((input&0x3ff)+0xdc00);
+ *output = (wxUint16) ((input&0x3ff)+0xdc00);
}
return 2;
}
return (size_t)-1;
}
#ifdef WC_UTF16
- size_t pa = encode_utf16(res, buf);
+ // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+ size_t pa = encode_utf16(res, (wxUint16 *)buf);
if (pa == (size_t)-1)
return (size_t)-1;
if (buf)
{
wxUint32 cc;
#ifdef WC_UTF16
- size_t pa = decode_utf16(psz, cc);
+ // cast is ok for WC_UTF16
+ size_t pa = decode_utf16((const wxUint16 *)psz, cc);
psz += (pa == (size_t)-1) ? 1 : pa;
#else
cc=(*psz++) & 0x7fffffff;
if (buf)
{
*(wxUint16*)buf = cc[0];
- buf += sizeof(wxUint16);
+ buf += sizeof(wxUint16);
if (pa > 1)
{
*(wxUint16*)buf = cc[1];
{
wxUint32 cc;
- size_t pa=decode_utf16(psz, cc);
+ // cast is ok for WC_UTF16
+ size_t pa = decode_utf16((const wxUint16 *)psz, cc);
if (pa == (size_t)-1)
return pa;
len += sizeof(wxUint32);
psz += pa;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
len += pa;
psz += sizeof(wxUint32);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len<n)
+ *buf=0;
return len;
}
{
char cc[4];
- size_t pa=decode_utf16(psz, *(wxUint32*)cc);
+ // cast is ok for WC_UTF16
+ size_t pa=decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc);
if (pa == (size_t)-1)
return pa;
len += sizeof(wxUint32);
psz += pa;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
len++;
psz += sizeof(wxUint32);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len<n)
+ *buf=0;
return len;
}
psz++;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
len++;
psz += sizeof(wxUint32);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len<n)
+ *buf=0;
return len;
}
len += sizeof(wxUint32);
psz++;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
buf ? n : 0 // size of output buffer
);
- // note that it returns # of written chars for buf != NULL and *size*
- // of the needed buffer for buf == NULL
- return len ? (buf ? len : len - 1) : (size_t)-1;
+ // note that it returns count of written chars for buf != NULL and size
+ // of the needed buffer for buf == NULL so in either case the length of
+ // the string (which never includes the terminating NUL) is one less
+ return len ? len - 1 : (size_t)-1;
}
size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
NULL // [out] was it used?
);
- // see the comment above!
- return len ? (buf ? len : len - 1) : (size_t)-1;
+ // see the comment above for the reason of "len - 1"
+ return len ? len - 1 : (size_t)-1;
}
bool IsOk() const
m_deferred = true;
}
-// find a valid value for the encoding
-void wxCSConv::SetEncoding()
-{
-#if wxUSE_INTL
- m_encoding = wxLocale::GetSystemEncoding();
-#else
- m_encoding = wxFONTENCODING_SYSTEM;
-#endif
-}
-
wxCSConv::wxCSConv(const wxChar *charset)
{
Init();
if ( charset )
{
- // not used
- m_encoding = wxFONTENCODING_SYSTEM;
-
SetName(charset);
}
- else // no charset specified
- {
- SetEncoding();
- }
+
+ m_encoding = wxFONTENCODING_SYSTEM;
}
wxCSConv::wxCSConv(wxFontEncoding encoding)
{
- if ( encoding == wxFONTENCODING_MAX ||
- encoding == wxFONTENCODING_DEFAULT )
+ if ( encoding == wxFONTENCODING_MAX || encoding == wxFONTENCODING_DEFAULT )
{
wxFAIL_MSG( _T("invalid encoding value in wxCSConv ctor") );
Init();
- if ( encoding == wxFONTENCODING_SYSTEM )
- {
- SetEncoding();
- }
- else // have valid encoding, use it
- {
- m_encoding = encoding;
- }
+ m_encoding = encoding;
}
wxCSConv::~wxCSConv()
}
}
-static inline bool DoesntNeedConv(wxFontEncoding enc)
-{
- return enc == wxFONTENCODING_DEFAULT ||
- enc == wxFONTENCODING_SYSTEM ||
- enc == wxFONTENCODING_ISO8859_1;
-}
-
wxMBConv *wxCSConv::DoCreate() const
{
-#if wxUSE_FONTMAP
- wxFontMapper * const fontMapper = wxFontMapper::Get();
-
- wxFontEncoding encFromName = m_name ? fontMapper->CharsetToEncoding(m_name)
- : wxFONTENCODING_SYSTEM;
-#endif // wxUSE_FONTMAP
-
- // check for the special case of ASCII charset
- if ( (!m_name && DoesntNeedConv(m_encoding))
-#if wxUSE_FONTMAP
- || (m_name && DoesntNeedConv(encFromName))
-#endif // wxUSE_FONTMAP
- )
+ // check for the special case of ASCII or ISO8859-1 charset: as we have
+ // special knowledge of it anyhow, we don't need to create a special
+ // conversion object
+ if ( m_encoding == wxFONTENCODING_ISO8859_1 )
{
// don't convert at all
return NULL;
// step (1)
#ifdef HAVE_ICONV
+#if !wxUSE_FONTMAP
if ( m_name )
+#endif // !wxUSE_FONTMAP
{
- wxMBConv_iconv *conv = new wxMBConv_iconv(m_name);
+ wxString name(m_name);
+
+#if wxUSE_FONTMAP
+ if ( name.empty() )
+ name = wxFontMapper::Get()->GetEncodingName(m_encoding);
+#endif // wxUSE_FONTMAP
+
+ wxMBConv_iconv *conv = new wxMBConv_iconv(name);
if ( conv->IsOk() )
return conv;
// step (2)
wxFontEncoding enc = m_encoding;
#if wxUSE_FONTMAP
- if ( enc == wxFONTENCODING_SYSTEM )
- enc = encFromName;
+ if ( enc == wxFONTENCODING_SYSTEM && m_name )
+ {
+ // use "false" to suppress interactive dialogs -- we can be called from
+ // anywhere and popping up a dialog from here is the last thing we want to
+ // do
+ enc = wxFontMapper::Get()->CharsetToEncoding(m_name, false);
+ }
#endif // wxUSE_FONTMAP
switch ( enc )
case wxFONTENCODING_UTF8:
return new wxMBConvUTF8;
- case wxFONTENCODING_UTF16:
- return new wxMBConvUTF16;
-
case wxFONTENCODING_UTF16BE:
return new wxMBConvUTF16BE;
case wxFONTENCODING_UTF16LE:
return new wxMBConvUTF16LE;
- case wxFONTENCODING_UTF32:
- return new wxMBConvUTF32;
-
case wxFONTENCODING_UTF32BE:
return new wxMBConvUTF32BE;
}
#endif // wxUSE_FONTMAP
- wxLogError(_("Cannot convert from the charset '%s'!"),
- m_name ? m_name
+ // NB: This is a hack to prevent deadlock. What could otherwise happen
+ // in Unicode build: wxConvLocal creation ends up being here
+ // because of some failure and logs the error. But wxLog will try to
+ // attach timestamp, for which it will need wxConvLocal (to convert
+ // time to char* and then wchar_t*), but that fails, tries to log
+ // error, but wxLog has a (already locked) critical section that
+ // guards static buffer.
+ static bool alreadyLoggingError = false;
+ if (!alreadyLoggingError)
+ {
+ alreadyLoggingError = true;
+ wxLogError(_("Cannot convert from the charset '%s'!"),
+ m_name ? m_name
:
#if wxUSE_FONTMAP
wxFontMapper::GetEncodingDescription(m_encoding).c_str()
wxString::Format(_("encoding %s"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
);
+ alreadyLoggingError = false;
+ }
return NULL;
}
if ( m_deferred )
{
wxCSConv *self = (wxCSConv *)this; // const_cast
+
+#if wxUSE_INTL
+ // if we don't have neither the name nor the encoding, use the default
+ // encoding for this system
+ if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
+ {
+ self->m_name = wxStrdup(wxLocale::GetSystemEncodingName());
+ }
+#endif // wxUSE_INTL
+
self->m_convReal = DoCreate();
self->m_deferred = false;
}
if (buf)
{
for (size_t c = 0; c <= len; c++)
- buf[c] = (psz[c] > 0xff) ? '?' : psz[c];
+ {
+ if (psz[c] > 0xFF)
+ return (size_t)-1;
+ buf[c] = psz[c];
+ }
+ }
+ else
+ {
+ for (size_t c = 0; c <= len; c++)
+ {
+ if (psz[c] > 0xFF)
+ return (size_t)-1;
+ }
}
return len;
#ifdef __WINDOWS__
static wxMBConv_win32 wxConvLibcObj;
#else
- static wxMBConvSystem wxConvLibcObj;
+ static wxMBConvLibc wxConvLibcObj;
#endif
static wxCSConv wxConvLocalObj(wxFONTENCODING_SYSTEM);
projects / wxWidgets.git / blobdiff