X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13dd924a3f079ef4fb0fc922c145e47654c26934..a290fa5a7deebe9d96c0c0089d18e27d4bd9b624:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index c10d2e211b..ff16d13d00 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -40,6 +40,9 @@
 
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
+#endif
+
+#ifdef __WINDOWS__
     #include "wx/msw/missing.h"
 #endif
 
@@ -69,11 +72,12 @@
 
 #include "wx/encconv.h"
 #include "wx/fontmap.h"
+#include "wx/utils.h"
 
 #ifdef __WXMAC__
-#include "ATSUnicode.h"
-#include "TextCommon.h"
-#include "TextEncodingConverter.h"
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
 
 #include  "wx/mac/private.h"  // includes mac headers
 #endif
@@ -177,9 +181,11 @@ const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
         {
             // now do the actual conversion
             wxWCharBuffer buf(nLen);
-            MB2WC(buf.data(), psz, nLen + 1); // with the trailing NUL
-
-            return buf;
+            nLen = MB2WC(buf.data(), psz, nLen + 1); // with the trailing NULL
+            if ( nLen != (size_t)-1 )
+            {
+                return buf;
+            }
         }
     }
 
@@ -196,9 +202,11 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
         if ( nLen != (size_t)-1 )
         {
             wxCharBuffer buf(nLen+3);       // space for a wxUint32 trailing zero
-            WC2MB(buf.data(), pwz, nLen + 4);
-
-            return buf;
+            nLen = WC2MB(buf.data(), pwz, nLen + 4);
+            if ( nLen != (size_t)-1 )
+            {
+                return buf;
+            }
         }
     }
 
@@ -951,7 +959,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
             {
                 ms_wcCharsetName = NULL;
 
-                // VS: we must not output an error here, since wxWindows will safely
+                // VS: we must not output an error here, since wxWidgets will safely
                 //     fall back to using wxEncodingConverter.
                 wxLogTrace(wxT("strconv"), wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);
                 //wxLogError(
@@ -1113,8 +1121,10 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 #ifdef wxHAVE_WIN32_MB2WC
 
 // from utils.cpp
+#if wxUSE_FONTMAP 
 extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const wxChar *charset);
 extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding);
+#endif
 
 class wxMBConv_win32 : public wxMBConv
 {
@@ -1124,6 +1134,7 @@ public:
         m_CodePage = CP_ACP;
     }
 
+#if wxUSE_FONTMAP
     wxMBConv_win32(const wxChar* name)
     {
         m_CodePage = wxCharsetToCodepage(name);
@@ -1133,6 +1144,7 @@ public:
     {
         m_CodePage = wxEncodingToCodepage(encoding);
     }
+#endif
 
     size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
     {
@@ -1305,11 +1317,8 @@ public:
 	{
 	    OSStatus status = noErr ;
 		m_char_encoding = encoding ;
-#if SIZEOF_WCHAR_T == 4
-		m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
-#else
 		m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-#endif		
+
 	    status = TECCreateConverter(&m_MB2WC_converter,
 	                                m_char_encoding,
 	                                m_unicode_encoding);
@@ -1324,21 +1333,35 @@ public:
 	    ByteCount byteOutLen ;
 	    ByteCount byteInLen = strlen(psz) ;
 		wchar_t *tbuf = NULL ;
+		UniChar* ubuf = NULL ;
+		size_t res = 0 ;
 		
 		if (buf == NULL)
 		{
 			n = byteInLen ;
 			tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ;
 		}
-	
-	    ByteCount byteBufferLen = 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
 	    status = TECConvertText(m_MB2WC_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
-	      (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen);
-
+	      (TextPtr) ubuf , byteBufferLen, &byteOutLen);
+#if SIZEOF_WCHAR_T == 4
+        // 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
+        ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
+		wxMBConvUTF16BE converter ;
+		res = converter.MB2WC( (buf ? buf : tbuf) , (const char*)ubuf , n ) ;
+		free( ubuf ) ;
+#else
+		res = byteOutLen / sizeof( UniChar ) ;
+#endif
 		if ( buf == NULL )
 			free(tbuf) ;
 
-		size_t res = byteOutLen / SIZEOF_WCHAR_T ;
         if ( buf  && res < n)
             buf[res] = 0;
 
@@ -1361,9 +1384,21 @@ public:
 		}
 
 	    ByteCount byteBufferLen = n ;
-	    status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
-	       (TextPtr) ( buf ? buf : tbuf ) , byteBufferLen, &byteOutLen);
-
+		UniChar* ubuf = NULL ;
+#if SIZEOF_WCHAR_T == 4
+		wxMBConvUTF16BE converter ;
+		size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ;
+		byteInLen = unicharlen ;
+		ubuf = (UniChar*) malloc( byteInLen + 2 ) ;
+		converter.WC2MB( (char*) ubuf , psz, unicharlen + 2 ) ;
+#else
+		ubuf = (UniChar*) psz ;
+#endif
+	    status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) ubuf , byteInLen, &byteInLen,
+	       (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen);
+#if SIZEOF_WCHAR_T == 4
+		free( ubuf ) ;
+#endif
 		if ( buf == NULL )
 			free(tbuf) ;
 
@@ -1574,12 +1609,16 @@ wxMBConv *wxCSConv::DoCreate() const
 
 #ifdef wxHAVE_WIN32_MB2WC
     {
+#if wxUSE_FONTMAP
         wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name)
                                       : new wxMBConv_win32(m_encoding);
         if ( conv->IsOk() )
             return conv;
 
         delete conv;
+#else
+        return NULL;
+#endif
     }
 #endif // wxHAVE_WIN32_MB2WC
 #if defined(__WXMAC__)