X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24f588af92d50c77142e299ff66ba45b88915c8c..9548c49a6a1e4533976450205de136d9edbe91b0:/src/common/strconv.cpp diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index ffb8be0d21..0610b43452 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; @@ -67,7 +71,8 @@ public: virtual void OnExit() { #if wxUSE_WCHAR_T - wxConvLocal.Clear(); + wxConvLocal.Clear(); + wxConvISO8859_1.Clear(); #endif } @@ -186,61 +191,87 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output) // wxMBConv // ---------------------------------------------------------------------------- -size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const -{ - return wxMB2WC(buf, psz, n); -} +#define IGNORE_LIBC 0 -size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const +wxMBConv::~wxMBConv() { - return wxWC2MB(buf, psz, n); + // nothing to do here } -const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const +size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const { - if (psz) +#if IGNORE_LIBC + if (buf) { - 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; + for (size_t i = 0; i < strlen( psz )+1; i++) + buf[i] = (wchar_t) psz[i]; + return strlen( psz ); } else - return wxWCharBuffer((wchar_t *) NULL); + { + return strlen( psz ); + } +#else + return wxMB2WC(buf, psz, n); +#endif } -const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const +size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const { - if (psz) +#if IGNORE_LIBC + if (buf) { - 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; + for (size_t i = 0; i < wxStrlen( psz )+1; i++) + buf[i] = (char) psz[i]; + return wxStrlen( psz ); } else - return wxCharBuffer((char *) NULL); + { + return wxStrlen( psz ); + } +#else + return wxWC2MB(buf, psz, n); +#endif } -// ---------------------------------------------------------------------------- -// standard file conversion -// ---------------------------------------------------------------------------- +const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const +{ + if ( psz ) + { + // 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 -WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile; + return buf; + } + } -// just use the libc conversion for now -size_t wxMBConvFile::MB2WC(wchar_t *buf, const char *psz, size_t n) const -{ - return wxMB2WC(buf, psz, n); + wxWCharBuffer buf((wchar_t *)NULL); + + return buf; } -size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const +const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const { - return wxWC2MB(buf, psz, n); + if ( pwz ) + { + size_t nLen = WC2MB(NULL, pwz, 0); + if ( nLen != (size_t)-1 ) + { + wxCharBuffer buf(nLen); + WC2MB(buf.data(), pwz, nLen + 1); + + return buf; + } + } + + wxCharBuffer buf((char *)NULL); + + return buf; } // ---------------------------------------------------------------------------- @@ -425,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; @@ -701,6 +739,12 @@ 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. + if (res < n) + buf[0] = 0; } else { @@ -740,6 +784,12 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n) #if defined(__WIN32__) && !defined(__WXMICROWIN__) +#ifdef __WXWINE__ + #define WINE_CAST (WCHAR *) +#else + #define WINE_CAST +#endif + extern long wxCharsetToCodepage(const wxChar *charset); // from utils.cpp class CP_CharSet : public wxCharacterSet @@ -753,20 +803,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) + WINE_CAST 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) + WINE_CAST 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 @@ -808,12 +875,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); @@ -956,14 +1018,20 @@ 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(); if ( !name.empty() ) + { SetName(name); + } } +#endif // wxUSE_INTL // wxGetCharacterSet() complains about NULL name m_cset = m_name ? wxGetCharacterSet(m_name) : NULL; @@ -998,12 +1066,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++)