byte ordering changed to network ordering

[wxWidgets.git] / src / common / strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index c10d2e211b0c70ee887b4536d656362c18d18d4f..9612c11ca9790012d75decc452d3ffb28472c2a9 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -71,9 +71,9 @@
 #include "wx/fontmap.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 +177,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 +198,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;
+            }
         }
     }
 
@@ -1305,11 +1309,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 +1325,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 +1376,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) ;