X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4c2bd8403ea224ae5ce482f9a6cc2ac8c902dac..c4f4cf895c1576d2c474a8ebec5d3ee01b98d5f7:/src/common/strconv.cpp?ds=sidebyside diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index cf96614eef..b15169ac54 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -52,9 +52,13 @@ #if wxUSE_WCHAR_T WXDLLEXPORT_DATA(wxMBConv) wxConvLibc; WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL); + WXDLLEXPORT_DATA(wxCSConv) wxConvISO8859_1(_T("iso-8859-1")); #else // stand-ins in absence of wchar_t - WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile; + WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, + wxConvFile, + wxConvISO8859_1, + wxConvLocal; #endif // wxUSE_WCHAR_T WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc; @@ -68,6 +72,7 @@ public: { #if wxUSE_WCHAR_T wxConvLocal.Clear(); + wxConvISO8859_1.Clear(); #endif } @@ -188,6 +193,11 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output) #define IGNORE_LIBC 0 +wxMBConv::~wxMBConv() +{ + // nothing to do here +} + size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const { #if IGNORE_LIBC @@ -226,32 +236,42 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const { - if (psz) + if ( psz ) { - size_t nLen = MB2WC((wchar_t *) NULL, psz, 0); // return value excludes /0 - if (nLen == (size_t)-1) - return wxWCharBuffer((wchar_t *) NULL); - wxWCharBuffer buf(nLen); // this allocates nLen1+ - MB2WC((wchar_t *)(const wchar_t *) buf, psz, nLen+1); - return buf; + // calculate the length of the buffer needed first + size_t nLen = MB2WC(NULL, psz, 0); + if ( nLen != (size_t)-1 ) + { + // now do the actual conversion + wxWCharBuffer buf(nLen); + MB2WC(buf.data(), psz, nLen + 1); // with the trailing NUL + + return buf; + } } - else - return wxWCharBuffer((wchar_t *) NULL); + + wxWCharBuffer buf((wchar_t *)NULL); + + return buf; } -const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const +const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const { - if (psz) + if ( pwz ) { - size_t nLen = WC2MB((char *) NULL, psz, 0); // return value excludes /0 - if (nLen == (size_t)-1) - return wxCharBuffer((char *) NULL); - wxCharBuffer buf(nLen); // this allocates nLen+1 - WC2MB((char *)(const char *) buf, psz, nLen+1); - return buf; + size_t nLen = WC2MB(NULL, pwz, 0); + if ( nLen != (size_t)-1 ) + { + wxCharBuffer buf(nLen); + WC2MB(buf.data(), pwz, nLen + 1); + + return buf; + } } - else - return wxCharBuffer((char *) NULL); + + wxCharBuffer buf((char *)NULL); + + return buf; } // ---------------------------------------------------------------------------- @@ -436,7 +456,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const } if (buf && (len 0x530) - size_t inbuf = std::wcslen(psz) * SIZEOF_WCHAR_T; -#else - size_t inbuf = ::wcslen(psz) * SIZEOF_WCHAR_T; -#endif + size_t inbuf = wxWcslen(psz) * SIZEOF_WCHAR_T; size_t outbuf = n; size_t res, cres; @@ -723,7 +739,7 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n) cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf ); res = n-outbuf; - + // NB: iconv was given only wcslen(psz) characters on input, and so // it couldn't convert the trailing zero. Let's do it ourselves // if there's some room left for it in the output buffer. @@ -766,7 +782,7 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n) // Win32 conversion classes // ============================================================================ -#if defined(__WIN32__) && !defined(__WXMICROWIN__) +#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__) extern long wxCharsetToCodepage(const wxChar *charset); // from utils.cpp @@ -781,20 +797,37 @@ public: size_t MB2WC(wchar_t *buf, const char *psz, size_t n) { - size_t len = - MultiByteToWideChar(m_CodePage, 0, psz, -1, buf, buf ? n : 0); - //VS: returns # of written chars for buf!=NULL and *size* - // needed buffer for buf==NULL - return len ? (buf ? len : len-1) : (size_t)-1; + const size_t len = ::MultiByteToWideChar + ( + m_CodePage, // code page + 0, // flags (none) + psz, // input string + -1, // its length (NUL-terminated) + buf, // output string + 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; } size_t WC2MB(char *buf, const wchar_t *psz, size_t n) { - size_t len = WideCharToMultiByte(m_CodePage, 0, psz, -1, buf, - buf ? n : 0, NULL, NULL); - //VS: returns # of written chars for buf!=NULL and *size* - // needed buffer for buf==NULL - return len ? (buf ? len : len-1) : (size_t)-1; + const size_t len = ::WideCharToMultiByte + ( + m_CodePage, // code page + 0, // flags (none) + psz, // input string + -1, // it is (wide) NUL-terminated + buf, // output buffer + buf ? n : 0, // and its size + NULL, // default "replacement" char + NULL // [out] was it used? + ); + + // see the comment above! + return len ? (buf ? len : len - 1) : (size_t)-1; } bool usable() const @@ -803,7 +836,7 @@ public: public: long m_CodePage; }; -#endif // __WIN32__ +#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__) // ============================================================================ // wxEncodingConverter based conversion classes @@ -836,12 +869,7 @@ public: size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) { -#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \ - || ( defined(__MWERKS__) && defined(__WXMSW__) ) - size_t inbuf = std::wcslen(psz); -#else - size_t inbuf = ::wcslen(psz); -#endif + const size_t inbuf = wxWcslen(psz); if (buf) w2m.Convert(psz,buf); @@ -908,14 +936,14 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name) cset = NULL; } -#if defined(__WIN32__) && !defined(__WXMICROWIN__) +#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__) cset = new CP_CharSet(name); if ( cset->usable() ) return cset; delete cset; cset = NULL; -#endif // __WIN32__ +#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__) #if wxUSE_FONTMAP cset = new EC_CharSet(name); @@ -984,8 +1012,11 @@ void wxCSConv::SetName(const wxChar *charset) void wxCSConv::LoadNow() { - if (m_deferred) + if ( m_deferred ) { + // it would probably be better to make GetSystemEncodingName() always + // available (i.e. even when wxUSE_INTL == 0)? +#if wxUSE_INTL if ( !m_name ) { wxString name = wxLocale::GetSystemEncodingName(); @@ -994,6 +1025,7 @@ void wxCSConv::LoadNow() SetName(name); } } +#endif // wxUSE_INTL // wxGetCharacterSet() complains about NULL name m_cset = m_name ? wxGetCharacterSet(m_name) : NULL; @@ -1028,12 +1060,7 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const return m_cset->WC2MB(buf, psz, n); // latin-1 (direct) -#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \ - || ( defined(__MWERKS__) && defined(__WXMSW__) ) - size_t len=std::wcslen(psz); -#else - size_t len=::wcslen(psz); -#endif + const size_t len = wxWcslen(psz); if (buf) { for (size_t c = 0; c <= len; c++)