X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbb0b8afd092175d943a280c5f1835705cb9a746..9c862cfb93c8d54cfdd18a7c54c518b1234afa1c:/src/common/strconv.cpp diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index a603d02f18..95ef424042 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -16,6 +16,9 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/missing.h" + #endif #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" @@ -28,7 +31,6 @@ #ifdef __WINDOWS__ #include "wx/msw/private.h" - #include "wx/msw/missing.h" #endif #ifndef __WXWINCE__ @@ -1668,7 +1670,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name) #if wxUSE_FONTMAP const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC); #else // !wxUSE_FONTMAP - static const wxChar *names[] = + static const wxChar *names_static[] = { #if SIZEOF_WCHAR_T == 4 _T("UCS-4"), @@ -1677,6 +1679,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name) #endif NULL }; + const wxChar **names = names_static; #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP for ( ; *names && ms_wcCharsetName.empty(); ++names ) @@ -2228,11 +2231,11 @@ private: int verMaj, verMin; switch ( wxGetOsVersion(&verMaj, &verMin) ) { - case wxWIN95: + case wxOS_WINDOWS_9X: s_isWin98Or2k = verMaj >= 4 && verMin >= 10; break; - case wxWINDOWS_NT: + case wxOS_WINDOWS_NT: s_isWin98Or2k = verMaj >= 5; break; @@ -2584,7 +2587,7 @@ public: Init( wxCFStringEncFromFontEnc(encoding) ); } - ~wxMBConv_cocoa() + virtual ~wxMBConv_cocoa() { } @@ -2739,7 +2742,7 @@ public: Init( wxMacGetSystemEncFromFontEnc(encoding) ); } - ~wxMBConv_mac() + virtual ~wxMBConv_mac() { OSStatus status = noErr ; if (m_MB2WC_converter) @@ -2772,7 +2775,7 @@ public: wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ; } } - + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const { CreateIfNeeded() ; @@ -2887,9 +2890,9 @@ public: virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); } bool IsOk() const - { + { CreateIfNeeded() ; - return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; + return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; } protected : @@ -2905,21 +2908,21 @@ protected : class wxMBConv_macUTF8D : public wxMBConv_mac { public : - wxMBConv_macUTF8D() + wxMBConv_macUTF8D() { Init( kTextEncodingUnicodeDefault , kUnicodeNoSubset , kUnicodeUTF8Format ) ; m_uni = NULL; m_uniBack = NULL ; } - - ~wxMBConv_macUTF8D() + + virtual ~wxMBConv_macUTF8D() { if (m_uni!=NULL) DisposeUnicodeToTextInfo(&m_uni); if (m_uniBack!=NULL) DisposeUnicodeToTextInfo(&m_uniBack); } - + size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const { CreateIfNeeded() ; @@ -2949,15 +2952,15 @@ public : ubuf = (UniChar*) psz ; #endif - // ubuf is a non-decomposed UniChar buffer - + // ubuf is a non-decomposed UniChar buffer + ByteCount dcubuflen = byteInLen * 2 + 2 ; ByteCount dcubufread , dcubufwritten ; - UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; - - ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , + UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; + + ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , dcubuf ) ; - + // we now convert that decomposed buffer into UTF8 status = TECConvertText( @@ -2982,7 +2985,7 @@ public : return res ; } - + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const { CreateIfNeeded() ; @@ -2992,25 +2995,25 @@ public : wchar_t *tbuf = NULL ; UniChar* ubuf = NULL ; size_t res = 0 ; - + if (buf == NULL) { // Apple specs say at least 32 n = wxMax( 32, byteInLen ) ; tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T ) ; } - + ByteCount byteBufferLen = n * sizeof( UniChar ) ; - + #if SIZEOF_WCHAR_T == 4 ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ; #else ubuf = (UniChar*) (buf ? buf : tbuf) ; #endif - + ByteCount dcubuflen = byteBufferLen * 2 + 2 ; ByteCount dcubufread , dcubufwritten ; - UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; + UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; status = TECConvertText( m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen, @@ -3018,16 +3021,16 @@ public : // 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 dcubuf[byteOutLen / sizeof( UniChar ) ] = 0 ; - + // now from the decomposed UniChar to properly composed uniChar - ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf , + ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf , kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , ubuf ) ; free( dcubuf ); byteOutLen = dcubufwritten ; ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ; - - + + #if SIZEOF_WCHAR_T == 4 wxMBConvUTF16 converter ; res = converter.MB2WC( (buf ? buf : tbuf), (const char*)ubuf, n ) ; @@ -3035,13 +3038,13 @@ public : #else res = byteOutLen / sizeof( UniChar ) ; #endif - + if ( buf == NULL ) free(tbuf) ; - + if ( buf && res < n) buf[res] = 0; - + return res ; } @@ -3055,16 +3058,16 @@ public : m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeCanonicalDecompVariant, kTextEncodingDefaultFormat); m_map.mappingVersion = kUnicodeUseLatestMapping; - - OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni); + + OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni); wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ; - + m_map.unicodeEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeNoSubset, kTextEncodingDefaultFormat); m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeCanonicalCompVariant, kTextEncodingDefaultFormat); m_map.mappingVersion = kUnicodeUseLatestMapping; - err = CreateUnicodeToTextInfo(&m_map, &m_uniBack); + err = CreateUnicodeToTextInfo(&m_map, &m_uniBack); wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ; } } @@ -3072,7 +3075,7 @@ protected : mutable UnicodeToTextInfo m_uni; mutable UnicodeToTextInfo m_uniBack; mutable UnicodeMapping m_map; -}; +}; #endif // defined(__WXMAC__) && defined(TARGET_CARBON) // ============================================================================ @@ -3305,7 +3308,9 @@ wxMBConv *wxCSConv::DoCreate() const #endif // !wxUSE_FONTMAP { wxString name(m_name); +#if wxUSE_FONTMAP wxFontEncoding encoding(m_encoding); +#endif if ( !name.empty() ) { @@ -3336,20 +3341,26 @@ wxMBConv *wxCSConv::DoCreate() const } const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding); - - for ( ; *names; ++names ) + // CS : in case this does not return valid names (eg for MacRoman) encoding + // got a 'failure' entry in the cache all the same, although it just has to + // be created using a different method, so only store failed iconv creation + // attempts (or perhaps we shoulnd't do this at all ?) + if ( names[0] != NULL ) { - wxMBConv_iconv *conv = new wxMBConv_iconv(*names); - if ( conv->IsOk() ) + for ( ; *names; ++names ) { - gs_nameCache[encoding] = *names; - return conv; + wxMBConv_iconv *conv = new wxMBConv_iconv(*names); + if ( conv->IsOk() ) + { + gs_nameCache[encoding] = *names; + return conv; + } + + delete conv; } - delete conv; + gs_nameCache[encoding] = _T(""); // cache the failure } - - gs_nameCache[encoding] = _T(""); // cache the failure } #endif // wxUSE_FONTMAP } @@ -3474,7 +3485,7 @@ wxMBConv *wxCSConv::DoCreate() const #if wxUSE_FONTMAP wxFontMapperBase::GetEncodingDescription(m_encoding).c_str() #else // !wxUSE_FONTMAP - wxString::Format(_("encoding %s"), m_encoding).c_str() + wxString::Format(_("encoding %i"), m_encoding).c_str() #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP ); @@ -3490,14 +3501,17 @@ void wxCSConv::CreateConvIfNeeded() const { 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 ) { +#if wxUSE_INTL self->m_name = wxStrdup(wxLocale::GetSystemEncodingName()); - } +#else + // fallback to some reasonable default: + self->m_encoding = wxFONTENCODING_ISO8859_1; #endif // wxUSE_INTL + } self->m_convReal = DoCreate(); self->m_deferred = false;