X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcb68102796280b3e54979ae95738089914ce842..410bb8c16bf390551038c9521331b474e7daef78:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index 5e14e76ff9..c199f98b4c 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -208,7 +208,7 @@ void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength) wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") ); return; } - memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar)); + wxMemcpy(m_pchData, psz + nPos, nLength); } } @@ -475,10 +475,10 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const wxASSERT( nStart <= length() ); //anchor - const wxChar* p = wxMemchr(c_str() + nStart, - str.c_str()[0], - length() - nStart); - + const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart, + str.c_str()[0], + length() - nStart); + if(!p) return npos; @@ -486,14 +486,14 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const wxMemcmp(p, str.c_str(), str.length()) ) { //anchor again - p = wxMemchr(++p, - str.c_str()[0], - length() - (p - c_str())); + p = (const wxChar*)wxMemchr(++p, + str.c_str()[0], + length() - (p - c_str())); if(!p) return npos; } - + return (p - c_str() + str.length() <= length()) ? p - c_str() : npos; } @@ -506,7 +506,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const { wxASSERT( nStart <= length() ); - const wxChar *p = wxMemchr(c_str() + nStart, ch, length() - nStart); + const wxChar *p = (const wxChar*)wxMemchr(c_str() + nStart, ch, length() - nStart); return p == NULL ? npos : p - c_str(); } @@ -609,7 +609,7 @@ size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const } size_t len = wxStrlen(sz); - + for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p ) { if ( wxMemchr(sz, *p, len) ) @@ -741,7 +741,7 @@ wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen, wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen, size_t nCount, wxChar ch) { - return replace(nStart, nLen, wxStringBase(ch, nCount).c_str()); + return replace(nStart, nLen, wxStringBase(nCount, ch).c_str()); } wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen, @@ -985,7 +985,107 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen, // =========================================================================== // --------------------------------------------------------------------------- -// construction +// common conversion routines +// --------------------------------------------------------------------------- + +#if wxUSE_WCHAR_T + +//Convert a wide character string of a specified length +//to a multi-byte character string, ignoring intermittent null characters +//returns the actual length of the string +inline size_t wxMbstr(wxCharBuffer& buffer, const wchar_t* szString, + size_t nStringLen, wxMBConv& conv) +{ + const wchar_t* szEnd = szString + nStringLen + 1; + const wchar_t* szPos = szString; + const wchar_t* szStart = szPos; + + size_t nActualLength = 0; + + //Convert the string until the length() is reached, continuing the + //loop every time a null character is reached + while(szPos != szEnd) + { + wxASSERT(szPos < szEnd); //something is _really_ screwed up if this rings true + + //Get the length of the current (sub)string + size_t nLen = conv.WC2MB(NULL, szPos, 0); + + wxASSERT(nLen != (size_t)-1); //should not be true! If it is system wctomb could be bad + + nActualLength += nLen + 1; + + wxASSERT(nActualLength <= (nStringLen<<1) + 1); //If this is true it means buffer overflow + + //Convert the current (sub)string + if ( conv.WC2MB(&buffer.data()[szPos - szStart], szPos, nLen + 1) == (size_t)-1 ) + { + //error - return empty buffer + wxFAIL_MSG(wxT("Error converting wide-character string to a multi-byte string")); + buffer.data()[0] = '\0'; + return 0; + } + + //Increment to next (sub)string + //Note that we have to use wxWcslen here instead of nLen + //here because XX2XX gives us the size of the output buffer, + //not neccessarly the length of the string + szPos += wxWcslen(szPos) + 1; + } + + return nActualLength - 1; //success - return actual length +} + +//Convert a multi-byte character string of a specified length +//to a wide character string, ignoring intermittent null characters +//returns the actual length +inline size_t wxWcstr( wxWCharBuffer& buffer, const char* szString, + size_t nStringLen, wxMBConv& conv) +{ + const char* szEnd = szString + nStringLen + 1; + const char* szPos = szString; + const char* szStart = szPos; + + size_t nActualLength = 0; + + //Convert the string until the length() is reached, continuing the + //loop every time a null character is reached + while(szPos != szEnd) + { + wxASSERT(szPos < szEnd); //something is _really_ screwed up if this rings true + + //Get the length of the current (sub)string + size_t nLen = conv.MB2WC(NULL, szPos, 0); + + wxASSERT(nLen != (size_t)-1); //should not be true! If it is system mbtowc could be bad + + nActualLength += nLen + 1; + + wxASSERT(nActualLength <= nStringLen + 1); //If this is true it means buffer overflow + + //Convert the current (sub)string + if ( conv.MB2WC(&buffer.data()[szPos - szStart], szPos, nLen + 1) == (size_t)-1 ) + { + //error - return empty buffer + wxFAIL_MSG(wxT("Error converting multi-byte string to a wide-character string")); + buffer.data()[0] = '\0'; + return 0; + } + + //Increment to next (sub)string + //Note that we have to use strlen here instead of nLen + //here because XX2XX gives us the size of the output buffer, + //not neccessarly the length of the string + szPos += strlen(szPos) + 1; + } + + return nActualLength - 1; //success - return actual length +} + +#endif //wxUSE_WCHAR_T + +// --------------------------------------------------------------------------- +// construction and conversion // --------------------------------------------------------------------------- #if wxUSE_UNICODE @@ -1012,7 +1112,10 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) if ( psz ) { // calculate the needed size ourselves or use the provided one - nLen = conv.MB2WC(NULL, psz, 0); + if (nLength == npos) + nLen = strlen(psz); + else + nLen = nLength; } else { @@ -1023,28 +1126,36 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) // anything to do? if ( (nLen != 0) && (nLen != (size_t)-1) ) { - if ( !Alloc(nLen) ) + //When converting mb->wc it never inflates to more characters than the length + wxWCharBuffer buffer(nLen + 1); + + //Convert the string + size_t nActualLength = wxWcstr(buffer, psz, nLen, conv); + + if ( !Alloc(nActualLength + 1) ) { - wxFAIL_MSG( _T("out of memory in wxString::wxString") ); + wxFAIL_MSG(wxT("Out of memory in wxString")); } else { - wxWCharBuffer buf(nLen); - // MB2WC wants the buffer size, not the string length hence +1 - nLen = conv.MB2WC(buf.data(), psz, nLen + 1); - - if ( nLen != (size_t)-1 ) - { - // initialized ok, set the real length as nLength specified by - // the caller could be greater than the real string length - assign(buf.data(), nLen); - return; - } - //else: the conversion failed -- leave the string empty (what else?) + //Copy the data + assign(buffer.data(), nActualLength); } } } +//Convert wxString in Unicode mode to a multi-byte string +const wxCharBuffer wxString::mb_str(wxMBConv& conv) const +{ + //*2 is the worst case - probably for UTF8 + wxCharBuffer buffer((length() << 1) + 1); + + //Do the actual conversion (will return a blank string on error) + wxMbstr(buffer, (*this).c_str(), length(), conv); + + return buffer; +} + #else // ANSI #if wxUSE_WCHAR_T @@ -1070,7 +1181,10 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength) if ( pwz ) { // calculate the needed size ourselves or use the provided one - nLen = conv.WC2MB(NULL, pwz, 0); + if (nLength == npos) + nLen = wxWcslen(pwz); + else + nLen = nLength; } else { @@ -1081,26 +1195,37 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength) // anything to do? if ( (nLen != 0) && (nLen != (size_t)-1) ) { - if ( !Alloc(nLen) ) + //*2 is the worst case - probably for UTF8 + wxCharBuffer buffer((nLen << 1) + 1); + + //do the actual conversion (if it fails we get an empty string) + size_t nActualLength = wxMbstr(buffer, pwz, nLen, conv); + + if ( !Alloc(nActualLength + 1) ) { - wxFAIL_MSG( _T("out of memory in wxString::wxString") ); + wxFAIL_MSG(wxT("Out of memory in wxString")); } else { - wxCharBuffer buf(nLen); - // WC2MB wants the buffer size, not the string length - if ( conv.WC2MB(buf.data(), pwz, nLen + 1) != (size_t)-1 ) - { - // initialized ok - assign(buf.data(), nLen); - return; - } - //else: the conversion failed -- leave the string empty (what else?) + //copy the data + assign(buffer.data(), nActualLength); } } +} + +//Converts this string to a wide character string if unicode +//mode is not enabled and wxUSE_WCHAR_T is enabled +const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const +{ + //mb->wc never inflates to more than the length + wxWCharBuffer buffer(length() + 1); + + //Do the actual conversion (will return a blank string on error) + wxWcstr(buffer, (*this).c_str(), length(), conv); - // leave empty + return buffer; } + #endif // wxUSE_WCHAR_T #endif // Unicode/ANSI