Ticket #3011: 0012-Convert-wchar_t-wstring-arguments-to-UTF-8-strings-i.patch

source/graphics/MapGenerator.cpp

@@ -222 +222 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR("CMapGeneratorWorker::GetCivData: Error reading directory '%s': %s", path.string8(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("CMapGeneratorWorker::GetCivData: Error reading directory '%s': %s", path.string8(), utf8_from_wstring(StatusDescription(ret, error, ARRAY_SIZE(error))));
     }
 
     return data;
@@ -284 +284 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR("CMapGeneratorWorker::LoadScripts: Error reading scripts in directory '%s': %s", path.string8(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("CMapGeneratorWorker::LoadScripts: Error reading scripts in directory '%s': %s", path.string8(), utf8_from_wstring(StatusDescription(ret, error, ARRAY_SIZE(error))));
         return false;
     }
 

source/graphics/MapReader.cpp

@@ -1052 +1052 @@
         entity_id_t player = cmpPlayerManager->GetPlayerByID(PlayerID);
         if (ent == INVALID_ENTITY || player == INVALID_ENTITY)
         {   // Don't add entities with invalid player IDs
-            LOGERROR("Failed to load entity template '%s'", TemplateName.c_str());
+            LOGERROR("Failed to load entity template '%s'", utf8_from_wstring(TemplateName));
         }
         else
         {
@@ -1430 +1430 @@
         entity_id_t player = cmpPlayerManager->GetPlayerByID(currEnt.playerID);
         if (ent == INVALID_ENTITY || player == INVALID_ENTITY)
         {   // Don't add entities with invalid player IDs
-            LOGERROR("Failed to load entity template '%s'", currEnt.templateName.c_str());
+            LOGERROR("Failed to load entity template '%s'", utf8_from_wstring(currEnt.templateName));
         }
         else
         {

source/graphics/ObjectEntry.cpp

@@ -73 +73 @@
         str << variation.color;
         int r, g, b;
         if (! (str >> r >> g >> b)) // Any trailing data is ignored
-            LOGERROR("Actor '%s' has invalid RGB colour '%s'", m_Base->m_ShortName.c_str(), variation.color.c_str());
+            LOGERROR("Actor '%s' has invalid RGB colour '%s'", utf8_from_wstring(m_Base->m_ShortName), variation.color);
         else
             m_Color = CColor(r/255.0f, g/255.0f, b/255.0f, 1.0f);
     }
@@ -133 +133 @@
     
     if (m_Samplers.size() == 0)
     {
-        LOGERROR("Actor '%s' has no textures.", m_Base->m_ShortName.c_str());
+        LOGERROR("Actor '%s' has no textures.", utf8_from_wstring(m_Base->m_ShortName));
     }
     
     std::vector<CObjectBase::Samp>::iterator samp;
@@ -209 +209 @@
         CObjectEntry* oe = objectManager.FindObjectVariation(prop.m_ModelName.c_str(), selections);
         if (!oe)
         {
-            LOGERROR("Failed to build prop model \"%s\" on actor \"%s\"", prop.m_ModelName.c_str(), m_Base->m_ShortName.c_str());
+            LOGERROR("Failed to build prop model \"%s\" on actor \"%s\"", utf8_from_wstring(prop.m_ModelName), utf8_from_wstring(m_Base->m_ShortName));
             continue;
         }
 
@@ -240 +240 @@
                 propmodel->ToCModel()->SetAnimation(oe->GetRandomAnimation("idle"));
         }
         else
-            LOGERROR("Failed to find matching prop point called \"%s\" in model \"%s\" for actor \"%s\"", ppn.c_str(), m_ModelName.string8(), m_Base->m_ShortName.c_str());
+            LOGERROR("Failed to find matching prop point called \"%s\" in model \"%s\" for actor \"%s\"", ppn, m_ModelName.string8(), utf8_from_wstring(m_Base->m_ShortName));
     }
 
     // setup flags

source/graphics/ObjectManager.cpp

@@ -96 +96 @@
     else
         delete obj;
 
-    LOGERROR("CObjectManager::FindObjectBase(): Cannot find object '%s'", objectname.c_str());
+    LOGERROR("CObjectManager::FindObjectBase(): Cannot find object '%s'", utf8_from_wstring(objectname));
 
     return 0;
 }

source/graphics/TerrainProperties.cpp

@@ -56 +56 @@
     if (rootName != "Terrains")
     {
         LOGERROR("TerrainProperties: Loading %s: Root node is not terrains (found \"%s\")",
-            pathname.string().c_str(),
-            rootName.c_str());
+            pathname.string8(),
+            rootName);
         return CTerrainPropertiesPtr();
     }
     
@@ -80 +80 @@
         else
         {
             LOGWARNING("TerrainProperties: Loading %s: Unexpected node %s\n",
-                pathname.string().c_str(),
-                XeroFile.GetElementString(child.GetNodeName()).c_str());
+                pathname.string8(),
+                XeroFile.GetElementString(child.GetNodeName()));
             // Keep reading - typos shouldn't be showstoppers
         }
     }

source/graphics/TerrainTextureEntry.cpp

@@ -253 +253 @@
         if (textures[i] < 0)
         {
             g_TexMan.m_TerrainAlphas.erase(it);
-            LOGERROR("Failed to load alphamap: %s", amtype.string());
+            LOGERROR("Failed to load alphamap: %s", amtype.string8());
             
             VfsPath standard("standard");
             if (path != standard)

source/gui/CGUI.cpp

@@ -1185 +1185 @@
         // Try setting the value
         if (object->SetSetting(pFile->GetAttributeString(attr.Name), attr.Value.FromUTF8(), true) != PSRETURN_OK)
         {
-            LOGERROR("GUI: (object: %s) Can't set \"%s\" to \"%s\"", object->GetPresentableName().c_str(), pFile->GetAttributeString(attr.Name).c_str(), attr.Value.FromUTF8().c_str());
+            LOGERROR("GUI: (object: %s) Can't set \"%s\" to \"%s\"", object->GetPresentableName(), pFile->GetAttributeString(attr.Name), attr.Value);
 
             // This is not a fatal error
         }
@@ -1248 +1248 @@
                 CVFSFile scriptfile;
                 if (scriptfile.Load(g_VFS, filename) != PSRETURN_OK)
                 {
-                    LOGERROR("Error opening GUI script action file '%s'", filename.c_str());
+                    LOGERROR("Error opening GUI script action file '%s'", utf8_from_wstring(filename));
                     throw PSERROR_GUI_JSOpenFailed();
                 }
 
@@ -1348 +1348 @@
             if (!filename.empty())
             {
                 if (!directory.empty())
-                    LOGWARNING("GUI: Include element found with file name (%s) and directory name (%s). Only the file will be processed.", filename.c_str(), directory.c_str());
+                    LOGWARNING("GUI: Include element found with file name (%s) and directory name (%s). Only the file will be processed.", utf8_from_wstring(filename), utf8_from_wstring(directory));
 
                 Paths.insert(filename);
 
                 CXeromyces XeroIncluded;
                 if (XeroIncluded.Load(g_VFS, filename) != PSRETURN_OK)
                 {
-                    LOGERROR("GUI: Error reading included XML: '%s'", filename.c_str());
+                    LOGERROR("GUI: Error reading included XML: '%s'", utf8_from_wstring(filename));
                     continue;
                 }
 
                 XMBElement node = XeroIncluded.GetRoot();
                 if (node.GetNodeName() != XeroIncluded.GetElementID("object"))
                 {
-                    LOGERROR("GUI: Error reading included XML: '%s', root element must have be of type 'object'.", filename.c_str());
+                    LOGERROR("GUI: Error reading included XML: '%s', root element must have be of type 'object'.", utf8_from_wstring(filename));
                     continue;
                 }
                 Xeromyces_ReadObject(node, &XeroIncluded, object, NameSubst, Paths, nesting_depth+1);
@@ -1491 +1491 @@
         }
         catch (PSERROR_Scripting& e)
         {
-            LOGERROR("GUI: Error executing script %s: %s", file.c_str(), e.what());
+            LOGERROR("GUI: Error executing script %s: %s", utf8_from_wstring(file), e.what());
         }
     }
 
@@ -1636 +1636 @@
         {
             CClientArea ca;
             if (!GUI<CClientArea>::ParseString(attr_value, ca))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_Size = ca;
         }
         else
@@ -1644 +1644 @@
         {
             CClientArea ca;
             if (!GUI<CClientArea>::ParseString(attr_value, ca))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_TextureSize = ca;
         }
         else
@@ -1652 +1652 @@
         {
             CRect rect;
             if (!GUI<CRect>::ParseString(attr_value, rect))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_TexturePlacementInFile = rect;
         }
         else
@@ -1660 +1660 @@
         {
             CSize size;
             if (!GUI<CSize>::ParseString(attr_value, size))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_CellSize = size;
         }
         else
@@ -1668 +1668 @@
         {
             float val;
             if (!GUI<float>::ParseString(attr_value, val))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_FixedHAspectRatio = val;
         }
         else
@@ -1676 +1676 @@
         {
             bool b;
             if (!GUI<bool>::ParseString(attr_value, b))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_RoundCoordinates = b;
         }
         else
@@ -1689 +1689 @@
             else if (attr_value == L"clamp_to_edge")
                 Image->m_WrapMode = GL_CLAMP_TO_EDGE;
             else
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
         }
         else
         if (attr_name == "z_level")
         {
             float z_level;
             if (!GUI<float>::ParseString(attr_value, z_level))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_DeltaZ = z_level/100.f;
         }
         else
@@ -1704 +1704 @@
         {
             CColor color;
             if (!GUI<CColor>::ParseString(attr_value, color))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_BackColor = color;
         }
         else
@@ -1712 +1712 @@
         {
             CColor color;
             if (!GUI<CColor>::ParseString(attr_value, color))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_BorderColor = color;
         }
         else
@@ -1720 +1720 @@
         {
             bool b;
             if (!GUI<bool>::ParseString(attr_value, b))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else Image->m_Border = b;
         }
         else
@@ -1773 +1773 @@
         {
             CColor color;
             if (!GUI<int>::ParseColor(attr_value, color, 0))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
             else effects.m_AddColor = color;
         }
         else if (attr_name == "grayscale")
@@ -1853 +1853 @@
         {
             bool b;
             if (!GUI<bool>::ParseString(attr_value.FromUTF8(), b))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, attr_value);
             else
                 scrollbar.m_UseEdgeButtons = b;
         }
@@ -1861 +1861 @@
         {
             float f;
             if (!GUI<float>::ParseString(attr_value.FromUTF8(), f))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, attr_value);
             else
                 scrollbar.m_Width = f;
         }
@@ -1870 +1870 @@
         {
             float f;
             if (!GUI<float>::ParseString(attr_value.FromUTF8(), f))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, attr_value);
             else
                 scrollbar.m_MinimumBarSize = f;
         }
@@ -1879 +1879 @@
         {
             float f;
             if (!GUI<float>::ParseString(attr_value.FromUTF8(), f))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, attr_value);
             else
                 scrollbar.m_MaximumBarSize = f;
         }
@@ -1952 +1952 @@
         {
             CSize size;
             if (!GUI<CSize>::ParseString(attr_value.FromUTF8(), size))
-                LOGERROR("Error parsing '%s' (\"%s\") inside <icon>.", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("Error parsing '%s' (\"%s\") inside <icon>.", attr_name, attr_value);
             else
                 icon.m_Size = size;
         }
@@ -1960 +1960 @@
         {
             int cell_id;
             if (!GUI<int>::ParseString(attr_value.FromUTF8(), cell_id))
-                LOGERROR("GUI: Error parsing '%s' (\"%s\") inside <icon>.", attr_name.c_str(), attr_value.c_str());
+                LOGERROR("GUI: Error parsing '%s' (\"%s\") inside <icon>.", attr_name, attr_value);
             else
                 icon.m_CellID = cell_id;
         }

source/gui/GUIManager.cpp

@@ -137 +137 @@
     JS::RootedValue global(cx, scriptInterface->GetGlobalObject());
     if (!scriptInterface->HasProperty(global, callback.c_str()))
     {
-        LOGERROR("The specified callback function %s does not exist in the page %s", callback.c_str(), m_PageStack.back().name.c_str());
+        LOGERROR("The specified callback function %s does not exist in the page %s", callback, utf8_from_wstring(m_PageStack.back().name));
         return;
     }
 
@@ -146 +146 @@
         scriptInterface->ReadStructuredClone(args, &argVal);
     if (!scriptInterface->CallFunctionVoid(global, callback.c_str(), argVal))
     {
-        LOGERROR("Failed to call the callback function %s in the page %s", callback.c_str(), m_PageStack.back().name.c_str());
+        LOGERROR("Failed to call the callback function %s in the page %s", callback, utf8_from_wstring(m_PageStack.back().name));
         return;
     }
 }
@@ -204 +204 @@
 
     if (root.GetNodeName() != elmt_page)
     {
-        LOGERROR("GUI page '%s' must have root element <page>", page.name.c_str());
+        LOGERROR("GUI page '%s' must have root element <page>", utf8_from_wstring(page.name));
         return;
     }
 
@@ -212 +212 @@
     {
         if (node.GetNodeName() != elmt_include)
         {
-            LOGERROR("GUI page '%s' must only have <include> elements inside <page>", page.name.c_str());
+            LOGERROR("GUI page '%s' must only have <include> elements inside <page>", utf8_from_wstring(page.name));
             continue;
         }
 
@@ -252 +252 @@
             hotloadDataVal)
         )
     {
-        LOGERROR("GUI page '%s': Failed to call init() function", page.name.c_str());
+        LOGERROR("GUI page '%s': Failed to call init() function", utf8_from_wstring(page.name));
     }
 
     m_CurrentGUI = oldGUI;
@@ -264 +264 @@
     {
         if (it->inputs.count(path))
         {
-            LOGMESSAGE("GUI file '%s' changed - reloading page '%s'", path.string8(), it->name.c_str());
+            LOGMESSAGE("GUI file '%s' changed - reloading page '%s'", path.string8(), utf8_from_wstring(it->name));
             LoadPage(*it);
             // TODO: this can crash if LoadPage runs an init script which modifies the page stack and breaks our iterators
         }

source/gui/GUIRenderer.cpp

@@ -144 +144 @@
             // Check colour is valid
             if (!GUI<CColor>::ParseString(value, color))
             {
-                LOGERROR("GUI: Error parsing sprite 'colour' (\"%s\")", value.c_str());
+                LOGERROR("GUI: Error parsing sprite 'colour' (\"%s\")", utf8_from_wstring(value));
                 return;
             }
 

source/gui/GUItext.cpp

@@ -306 +306 @@
             closing = false;
             if (++p == l)
             {
-                LOGERROR("Partial tag at end of string '%s'", str.c_str());
+                LOGERROR("Partial tag at end of string '%s'", utf8_from_wstring(str));
                 break;
             }
             if (str[p] == L'/')
@@ -314 +314 @@
                 closing = true;
                 if (tags.empty())
                 {
-                    LOGERROR("Encountered closing tag without having any open tags. At %d in '%s'", p, str.c_str());
+                    LOGERROR("Encountered closing tag without having any open tags. At %d in '%s'", p, utf8_from_wstring(str));
                     break;
                 }
                 if (++p == l)
                 {
-                    LOGERROR("Partial closing tag at end of string '%s'", str.c_str());
+                    LOGERROR("Partial closing tag at end of string '%s'", utf8_from_wstring(str));
                     break;
                 }
             }
@@ -332 +332 @@
                 {
                 case L' ':
                     if (closing) // We still parse them to make error handling cleaner
-                        LOGERROR("Closing tags do not support parameters (at pos %d '%s')", p, str.c_str());
+                        LOGERROR("Closing tags do not support parameters (at pos %d '%s')", p, utf8_from_wstring(str));
 
                     // parse something="something else"
                     for (++p; p < l && str[p] != L'='; ++p)
@@ -340 +340 @@
 
                     if (p == l)
                     {
-                        LOGERROR("Parameter without value at pos %d '%s'", p, str.c_str());
+                        LOGERROR("Parameter without value at pos %d '%s'", p, utf8_from_wstring(str));
                         break;
                     }
                     // fall-through
                 case L'=':
                     // parse a quoted parameter
                     if (closing) // We still parse them to make error handling cleaner
-                        LOGERROR("Closing tags do not support parameters (at pos %d '%s')", p, str.c_str());
+                        LOGERROR("Closing tags do not support parameters (at pos %d '%s')", p, utf8_from_wstring(str));
 
                     if (++p == l)
                     {
-                        LOGERROR("Expected parameter, got end of string '%s'", str.c_str());
+                        LOGERROR("Expected parameter, got end of string '%s'", utf8_from_wstring(str));
                         break;
                     }
                     if (str[p] != L'"')
                     {
-                        LOGERROR("Unquoted parameters are not supported (at pos %d '%s')", p, str.c_str());
+                        LOGERROR("Unquoted parameters are not supported (at pos %d '%s')", p, utf8_from_wstring(str));
                         break;
                     }
                     for (++p; p < l && str[p] != L'"'; ++p)
@@ -366 +366 @@
                         case L'\\':
                             if (++p == l)
                             {
-                                LOGERROR("Escape character at end of string '%s'", str.c_str());
+                                LOGERROR("Escape character at end of string '%s'", utf8_from_wstring(str));
                                 break;
                             }
                             // NOTE: We do not support \n in tag parameters
@@ -392 +392 @@
 
             if (!tag_.SetTagType(tag))
             {
-                LOGERROR("Invalid tag '%s' at %d in '%s'", tag.c_str(), p, str.c_str());
+                LOGERROR("Invalid tag '%s' at %d in '%s'", utf8_from_wstring(tag), p, utf8_from_wstring(str));
                 break;
             }
             if (!closing)
@@ -415 +415 @@
             {
                 if (tag != tags.back())
                 {
-                    LOGERROR("Closing tag '%s' does not match last opened tag '%s' at %d in '%s'", tag.c_str(), tags.back().c_str(), p, str.c_str());
+                    LOGERROR("Closing tag '%s' does not match last opened tag '%s' at %d in '%s'", utf8_from_wstring(tag), utf8_from_wstring(tags.back()), p, utf8_from_wstring(str));
                     break;
                 }
 
@@ -426 +426 @@
         case L'\\':
             if (++p == l)
             {
-                LOGERROR("Escape character at end of string '%s'", str.c_str());
+                LOGERROR("Escape character at end of string '%s'", utf8_from_wstring(str));
                 break;
             }
             if (str[p] == L'n')

source/network/NetClient.cpp

@@ -428 +428 @@
 
     CAuthenticateResultMessage* message = (CAuthenticateResultMessage*)event->GetParamRef();
 
-    LOGMESSAGE("Net: Authentication result: host=%u, %s", message->m_HostID, message->m_Message.c_str());
+    LOGMESSAGE("Net: Authentication result: host=%u, %s", message->m_HostID, utf8_from_wstring(message->m_Message));
 
     bool  isRejoining = (message->m_Code == ARC_OK_REJOINING);
 

source/network/NetServer.cpp

@@ -810 +810 @@
         // Players who weren't already in the game are not allowed to join now that it's started
         if (!isRejoining)
         {
-            LOGMESSAGE("Refused connection after game start from not-previously-known user \"%s\"", username.c_str());
+            LOGMESSAGE("Refused connection after game start from not-previously-known user \"%s\"", utf8_from_wstring(username));
             session->Disconnect(NDR_SERVER_ALREADY_IN_GAME);
             return true;
         }

source/network/NetTurnManager.cpp

@@ -57 +57 @@
     return str.str();
 }
 
+static std::string Hexify8(const std::string& s)
+{
+    std::stringstream str;
+    str << std::hex;
+    for (size_t i = 0; i < s.size(); ++i)
+        str << std::setfill('0') << std::setw(2) << (int)(unsigned char)s[i];
+    return str.str();
+}
+
 CNetTurnManager::CNetTurnManager(CSimulation2& simulation, u32 defaultTurnLength, int clientId, IReplayLogger& replay) :
     m_Simulation2(simulation), m_CurrentTurn(0), m_ReadyTurn(1), m_TurnLength(defaultTurnLength), m_DeltaSimTime(0),
     m_PlayerId(-1), m_ClientId(clientId), m_HasSyncError(false), m_Replay(replay),
@@ -237 +246 @@
     m_Simulation2.DumpDebugState(file);
     file.close();
 
-    std::wstringstream msg;
-    msg << L"Out of sync on turn " << turn << L": expected hash " << Hexify(expectedHash) << L"\n\n";
-    msg << L"Current state: turn " << m_CurrentTurn << L", hash " << Hexify(hash) << L"\n\n";
-    msg << L"Dumping current state to " << path;
+    std::stringstream msg;
+    msg << "Out of sync on turn " << turn << ": expected hash " << Hexify8(expectedHash) << "\n\n";
+    msg << "Current state: turn " << m_CurrentTurn << ", hash " << Hexify8(hash) << "\n\n";
+    msg << "Dumping current state to " << utf8_from_wstring(path.string());
     if (g_GUI)
-        g_GUI->DisplayMessageBox(600, 350, L"Sync error", msg.str());
+        g_GUI->DisplayMessageBox(600, 350, L"Sync error", wstring_from_utf8(msg.str()));
     else
-        LOGERROR("%s", msg.str().c_str());
+        LOGERROR("%s", msg.str());
 }
 
 void CNetTurnManager::Interpolate(float simFrameLength, float realFrameLength)

source/ps/ConfigDB.cpp

@@ -337 +337 @@
             CStr key(header + name);
             newMap[key] = values;
             if (key == "lobby.password")
-                LOGMESSAGE("Loaded config string \"%s\"", key.c_str());
+                LOGMESSAGE("Loaded config string \"%s\"", key);
             else
             {
                 std::string vals;
                 for (size_t i = 0; i < newMap[key].size() - 1; ++i)
                     vals += "\"" + EscapeString(newMap[key][i]) + "\", ";
                 vals += "\"" + EscapeString(newMap[key][values.size()-1]) + "\"";
-                LOGMESSAGE("Loaded config string \"%s\" = %s", key.c_str(), vals.c_str());
+                LOGMESSAGE("Loaded config string \"%s\" = %s", key, vals);
             }
         }
         else if (!name.empty())
-            LOGERROR("Encountered config setting '%s' without value while parsing '%s' on line %d", name.c_str(), m_ConfigFile[ns].string8(), line);
+            LOGERROR("Encountered config setting '%s' without value while parsing '%s' on line %d", name, m_ConfigFile[ns].string8(), line);
 
         name.clear();
         values.clear();
@@ -356 +356 @@
     }
 
     if (!name.empty())
-        LOGERROR("Config file does not have a new line after the last config setting '%s'", name.c_str());
+        LOGERROR("Config file does not have a new line after the last config setting '%s'", name);
 
     m_Map[ns].swap(newMap);
 

source/ps/GameSetup/GameSetup.cpp

@@ -293 +293 @@
 #warning TODO: cursors for Android
 #else
             if (cursor_draw(g_VFS, cursorName.c_str(), g_mouse_x, g_yres-g_mouse_y, forceGL) < 0)
-                LOGWARNING("Failed to draw cursor '%s'", cursorName.c_str());
+                LOGWARNING("Failed to draw cursor '%s'", utf8_from_wstring(cursorName));
 #endif
 
 #if CONFIG2_GLES
@@ -1246 +1246 @@
         else
         {
             // Problem with JSON file
-            LOGERROR("Autostart: Error reading random map script '%s'", scriptPath.c_str());
+            LOGERROR("Autostart: Error reading random map script '%s'", utf8_from_wstring(scriptPath));
             throw PSERROR_Game_World_MapLoadFailed("Error reading random map script.\nCheck application log for details.");
         }
 
@@ -1301 +1301 @@
     }
     else
     {
-        LOGERROR("Autostart: Unrecognized map type '%s'", mapDirectory.c_str());
+        LOGERROR("Autostart: Unrecognized map type '%s'", utf8_from_wstring(mapDirectory));
         throw PSERROR_Game_World_MapLoadFailed("Unrecognized map type.\nConsult readme.txt for the currently supported types.");
     }
     scriptInterface.SetProperty(attrs, "mapType", mapType);

source/ps/XML/Xeromyces.cpp

@@ -39 +39 @@
         message.erase(message.length()-1);
 
     LOGERROR("CXeromyces: Parse %s: %s:%d: %s",
-        error->level == XML_ERR_WARNING ? L"warning" : L"error",
-        error->file, error->line, message.c_str());
+        error->level == XML_ERR_WARNING ? "warning" : "error",
+        error->file, error->line, message);
     // TODO: The (non-fatal) warnings and errors don't get stored in the XMB,
     // so the caching is less transparent than it should be
 }

source/scriptinterface/ScriptInterface.cpp

@@ -163 +163 @@
     std::wstring str;
     if (!ScriptInterface::FromJSVal(cx, args.handleAt(0), str))
         return JS_FALSE;
-    LOGMESSAGE("%s", str.c_str());
+    LOGMESSAGE("%s", utf8_from_wstring(str));
     args.rval().setUndefined();
     return JS_TRUE;
 }
@@ -180 +180 @@
     std::wstring str;
     if (!ScriptInterface::FromJSVal(cx, args.handleAt(0), str))
         return JS_FALSE;
-    LOGWARNING("%s", str.c_str());
+    LOGWARNING("%s", utf8_from_wstring(str));
     args.rval().setUndefined();
     return JS_TRUE;
 }
@@ -197 +197 @@
     std::wstring str;
     if (!ScriptInterface::FromJSVal(cx, args.handleAt(0), str))
         return JS_FALSE;
-    LOGERROR("%s", str.c_str());
+    LOGERROR("%s", utf8_from_wstring(str));
     args.rval().setUndefined();
     return JS_TRUE;
 }
@@ -946 +946 @@
 
     std::wstring error;
     ScriptInterface::FromJSVal(m->m_cx, rval, error);
-    LOGERROR("%s", error.c_str());
+    LOGERROR("%s", utf8_from_wstring(error));
     return false;
 }
 

source/simulation2/Simulation2.cpp

@@ -828 +828 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR("Error reading directory '%s': %s", path.string8(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("Error reading directory '%s': %s", path.string8(), utf8_from_wstring(StatusDescription(ret, error, ARRAY_SIZE(error))));
         return std::vector<std::string>();
     }
 

source/simulation2/components/CCmpAIManager.cpp

@@ -124 +124 @@
             if (!m_ScriptInterface->GetProperty(global, moduleName.c_str(), &objectWithConstructor)
                 || objectWithConstructor.isUndefined())
             {
-                LOGERROR("Failed to create AI player: %s: can't find the module that should contain the constructor: '%s'", path.string8(), moduleName.c_str());
+                LOGERROR("Failed to create AI player: %s: can't find the module that should contain the constructor: '%s'", path.string8(), moduleName);
                 return false;
             }
 
@@ -138 +138 @@
             if (!m_ScriptInterface->GetProperty(objectWithConstructor, constructor.c_str(), &ctor)
                 || ctor.isNull())
             {
-                LOGERROR("Failed to create AI player: %s: can't find constructor '%s'", path.string8(), constructor.c_str());
+                LOGERROR("Failed to create AI player: %s: can't find constructor '%s'", path.string8(), constructor);
                 return false;
             }
 
@@ -160 +160 @@
 
             if (obj.isNull())
             {
-                LOGERROR("Failed to create AI player: %s: error calling constructor '%s'", path.string8(), constructor.c_str());
+                LOGERROR("Failed to create AI player: %s: error calling constructor '%s'", path.string8(), constructor);
                 return false;
             }
 
@@ -261 +261 @@
         VfsPaths pathnames;
         if (vfs::GetPathnames(g_VFS, L"simulation/ai/" + moduleName + L"/", L"*.js", pathnames) < 0)
         {
-            LOGERROR("Failed to load AI scripts for module %s", moduleName.c_str());
+            LOGERROR("Failed to load AI scripts for module %s", utf8_from_wstring(moduleName));
             return false;
         }
 
@@ -748 +748 @@
         std::pair<std::map<JSObject*, std::wstring>::iterator, bool> ret1 = m_SerializablePrototypes.insert(std::make_pair(obj, name));
         std::pair<std::map<std::wstring, JSObject*>::iterator, bool> ret2 = m_DeserializablePrototypes.insert(std::make_pair(name, obj));
         if (!ret1.second || !ret2.second)
-            LOGERROR("RegisterSerializablePrototype called with same prototype multiple times: p=%p n='%s'", obj, name.c_str());
+            LOGERROR("RegisterSerializablePrototype called with same prototype multiple times: p=%p n='%s'", (void *)obj, utf8_from_wstring(name));
     }
 
 private:

source/simulation2/components/CCmpProjectileManager.cpp

@@ -175 +175 @@
     {
         // If the actor was actually loaded, complain that it doesn't have a projectile
         if (!cmpSourceVisual->GetActorShortName().empty())
-            LOGERROR("Unit with actor '%s' launched a projectile but has no actor on 'projectile' attachpoint", cmpSourceVisual->GetActorShortName().c_str());
+            LOGERROR("Unit with actor '%s' launched a projectile but has no actor on 'projectile' attachpoint", utf8_from_wstring(cmpSourceVisual->GetActorShortName()));
         return 0;
     }
 

source/simulation2/serialization/BinarySerializer.cpp

@@ -317 +317 @@
             }
         }
 
-        LOGERROR("Cannot serialise JS objects of type 'function': %s", funcname.c_str());
+        LOGERROR("Cannot serialise JS objects of type 'function': %s", utf8_from_wstring(funcname));
         throw PSERROR_Serialize_InvalidScriptValue();
     }
     case JSTYPE_STRING:

source/simulation2/system/ComponentManager.cpp

@@ -887 +887 @@
         CComponentManager::ComponentTypeId cid = LookupCID(it->first);
         if (cid == CID__Invalid)
         {
-            LOGERROR("Unrecognised component type name '%s' in entity template '%s'", it->first.c_str(), templateName.c_str());
+            LOGERROR("Unrecognised component type name '%s' in entity template '%s'", it->first, utf8_from_wstring(templateName));
             return INVALID_ENTITY;
         }
 
         if (!AddComponent(handle, cid, it->second))
         {
-            LOGERROR("Failed to construct component type name '%s' in entity template '%s'", it->first.c_str(), templateName.c_str());
+            LOGERROR("Failed to construct component type name '%s' in entity template '%s'", it->first, utf8_from_wstring(templateName));
             return INVALID_ENTITY;
         }
         // TODO: maybe we should delete already-constructed components if one of them fails?
@@ -1226 +1226 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR("Error reading directory '%s': %s", cbData.path.string8(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("Error reading directory '%s': %s", cbData.path.string8(), utf8_from_wstring(StatusDescription(ret, error, ARRAY_SIZE(error))));
     }
     
     return cbData.templates;

source/simulation2/system/ParamNode.cpp

@@ -124 +124 @@
                             tokens.erase(tokenIt);
                         else
                             LOGWARNING("[ParamNode] Could not remove token '%s' from node '%s'%s; not present in list nor inherited (possible typo?)",
-                                newTokens[i].substr(1).c_str(), name.c_str(), sourceIdentifier ? (L" in '" + std::wstring(sourceIdentifier) + L"'").c_str() : L"");
+                                utf8_from_wstring(newTokens[i].substr(1)), name, sourceIdentifier ? (" in '" + utf8_from_wstring(sourceIdentifier) + "'").c_str() : "");
                     }
                     else
                     {

source/soundmanager/SoundManager.cpp

@@ -354 +354 @@
         debug_printf(L"Sound: AlcInit success, using %hs\n", dev_name);
     else
     {
-        LOGERROR("Sound: AlcInit failed, m_Device=%p m_Context=%p dev_name=%s err=%x\n", m_Device, m_Context, dev_name, err);
+        LOGERROR("Sound: AlcInit failed, m_Device=%p m_Context=%p dev_name=%s err=%x\n", (void *)m_Device, (void *)m_Context, dev_name, err);
 
 // FIXME Hack to get around exclusive access to the sound device
 #if OS_UNIX

source/soundmanager/scripting/SoundGroup.cpp

@@ -227 +227 @@
 {
     if (err == ERR::AGAIN)
         return; // open failed because sound is disabled (don't log this)
-    LOGERROR("%s: pathname=%s, error=%s", message.c_str(), pathname.string8(), ErrorString(err));
+    LOGERROR("%s: pathname=%s, error=%s", utf8_from_wstring(message), pathname.string8(), utf8_from_wstring(ErrorString(err)));
 }
 
 void CSoundGroup::PlayNext(const CVector3D& position, entity_id_t source)