Changeset 294 for cpp

Timestamp:

01/15/15 22:38:08 (10 years ago)

Author:

Maciej Komosinski

Message:

Converted string no longer includes trailing 0 (which prevented string concatenations)

File:

• cpp/common/Convert.cpp (modified) (2 diffs)

cpp/common/Convert.cpp

@@ -153 +153 @@
         wstring wstr;
         int nOffset = 0;
-        int nDataLen = strlen(str) + 1; //including ending \0
+        int nDataLen = strlen(str); //ending \0 is not converted, but resize() below sets the proper length of wstr
         int nLenWide = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)(str + nOffset),
                 (int)(nDataLen - nOffset), NULL, 0);
@@ -162 +162 @@
         {
                 //ASSERT(false); //some conversion error
-                return wstr;
+                return wstr + L"<UTF8_CONV_ERROR>";
         }
         return wstr;