X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14c90e0074aa2a5eb7a009d356a8181475ee7233..d6ddcd574bce0167851aef142be1f9722c694654:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index c0c44bb58a..92699a8c3a 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -97,7 +97,7 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
 
 #ifdef WC_UTF16
 
-static size_t encode_utf16(wxUint32 input, wxUint16 *output)
+static size_t encode_utf16(wxUint32 input, wchar_t *output)
 {
     if (input<=0xffff)
     {
@@ -119,7 +119,7 @@ static size_t encode_utf16(wxUint32 input, wxUint16 *output)
     }
 }
 
-static size_t decode_utf16(const wxUint16* input, wxUint32& output)
+static size_t decode_utf16(const wchar_t* input, wxUint32& output)
 {
     if ((*input<0xd800) || (*input>0xdfff))
     {
@@ -357,7 +357,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     {
         wxUint32 cc;
 #ifdef WC_UTF16
-        size_t pa = decode_utf16(psz,cc);
+        size_t pa = decode_utf16(psz, cc);
         psz += (pa == (size_t)-1) ? 1 : pa;
 #else
         cc=(*psz++) & 0x7fffffff;
@@ -402,7 +402,7 @@ WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
 // - perhaps common encodings to objects ("UTF8" -> wxConvUTF8)
 // - move wxEncodingConverter meat in here
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
 #include "wx/msw/registry.h"
 // this should work if M$ Internet Exploiter is installed
 static long CharsetToCodepage(const wxChar *name)
@@ -418,7 +418,7 @@ static long CharsetToCodepage(const wxChar *name)
         path += cn;
         wxRegKey key(wxRegKey::HKCR, path);
 
-        if (!key.Exists()) continue;
+        if (!key.Exists()) break;
 
         // two cases: either there's an AliasForCharset string,
         // or there are Codepage and InternetEncoding dwords.
@@ -616,7 +616,7 @@ public:
 };
 #endif
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
 class CP_CharSet : public wxCharacterSet
 {
 public:
@@ -627,14 +627,18 @@ public:
     {
         size_t len =
             MultiByteToWideChar(CodePage, 0, psz, -1, buf, buf ? n : 0);
-        return len ? len : (size_t)-1;
+        //VS: returns # of written chars for buf!=NULL and *size*
+        //    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(CodePage, 0, psz, -1, buf,
                                          buf ? n : 0, NULL, NULL);
-        return len ? len : (size_t)-1;
+        //VS: returns # of written chars for buf!=NULL and *size*
+        //    needed buffer for buf==NULL
+        return len ? (buf ? len : len-1) : (size_t)-1;
     }
 
     bool usable()
@@ -643,7 +647,9 @@ public:
 public:
     long CodePage;
 };
-#endif
+#endif // __WIN32__
+
+#if wxUSE_FONTMAP
 
 class EC_CharSet : public wxCharacterSet
 {
@@ -688,6 +694,8 @@ public:
     wxEncodingConverter m2w, w2m;
 };
 
+#endif // wxUSE_FONTMAP
+
 static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
 {
     wxCharacterSet *cset = NULL;
@@ -705,14 +713,16 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
         }
     }
 
-    if (cset && cset->usable()) return cset;
+    if (cset && cset->usable())
+        return cset;
+
     if (cset)
     {
         delete cset;
         cset = NULL;
     }
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
     cset = new CP_CharSet(name); // may take NULL
     if (cset->usable())
         return cset;
@@ -720,9 +730,11 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
     delete cset;
 #endif // __WIN32__
 
+#if wxUSE_FONTMAP
     cset = new EC_CharSet(name);
     if (cset->usable())
         return cset;
+#endif // wxUSE_FONTMAP
 
     delete cset;
     wxLogError(_("Unknown encoding '%s'!"), name);
@@ -764,7 +776,8 @@ void wxCSConv::LoadNow()
                 SetName(name);
         }
 
-        m_cset = wxGetCharacterSet(m_name);
+        // wxGetCharacterSet() complains about NULL name
+        m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
         m_deferred = FALSE;
     }
 }
@@ -850,10 +863,10 @@ public:
 class EC_CharSetConverter
 {
 public:
-    EC_CharSetConverter(EC_CharSet*from,EC_CharSet*to)
+    EC_CharSetConverter(EC_CharSet* from,EC_CharSet* to)
         { cnv.Init(from->enc,to->enc); }
 
-    size_t Convert(char*buf, const char*psz, size_t n)
+    size_t Convert(char* buf, const char* psz, size_t n)
     {
         size_t inbuf = strlen(psz);
         if (buf) cnv.Convert(psz,buf);