Ticket #3011: squashed.patch

build/premake/premake4.lua

@@ -741 +741 @@
         "maths",
         "maths/scripting",
         "i18n",
-        "i18n/scripting"
+        "i18n/scripting",
+        "third_party/cppformat",
     }
     extern_libs = {
         "spidermonkey",

source/graphics/ColladaManager.cpp

@@ -42 +42 @@
         VfsPath* path = static_cast<VfsPath*>(cb_data);
 
         if (severity == LOG_INFO)
-            LOGMESSAGE(L"%ls: %hs", path->string().c_str(), text);
+            LOGMESSAGE("%s: %s", path->string8(), text);
         else if (severity == LOG_WARNING)
-            LOGWARNING(L"%ls: %hs", path->string().c_str(), text);
+            LOGWARNING("%s: %s", path->string8(), text);
         else
-            LOGERROR(L"%ls: %hs", path->string().c_str(), text);
+            LOGERROR("%s: %s", path->string8(), text);
     }
 
     void ColladaOutput(void* cb_data, const char* data, unsigned int length)
@@ -99 +99 @@
         if (!dll.IsLoaded() && !TryLoadDLL())
             return ERR::FAIL;   
 
-        LOGMESSAGE(L"Hotloading skeleton definitions from '%ls'", path.string().c_str());
+        LOGMESSAGE("Hotloading skeleton definitions from '%s'", path.string8());
         // Set the filename for the logger to report
         set_logger(ColladaLog, const_cast<void*>(static_cast<const void*>(&path)));
 
         CVFSFile skeletonFile;
         if (skeletonFile.Load(m_VFS, path) != PSRETURN_OK)
         {
-            LOGERROR(L"Failed to read skeleton defintions from '%ls'", path.string().c_str());
+            LOGERROR("Failed to read skeleton defintions from '%s'", path.string8());
             return ERR::FAIL;
         }
 
         int ok = set_skeleton_definitions((const char*)skeletonFile.GetBuffer(), (int)skeletonFile.GetBufferSize());
         if (ok < 0)
         {
-            LOGERROR(L"Failed to load skeleton definitions from '%ls'", path.string().c_str());
+            LOGERROR("Failed to load skeleton definitions from '%s'", path.string8());
             return ERR::FAIL;
         }
 
@@ -189 +189 @@
     {
         if (!dll.LoadDLL())
         {
-            LOGERROR(L"Failed to load COLLADA conversion DLL");
+            LOGERROR("Failed to load COLLADA conversion DLL");
             return false;
         }
 
@@ -202 +202 @@
         }
         catch (PSERROR_DllLoader&)
         {
-            LOGERROR(L"Failed to load symbols from COLLADA conversion DLL");
+            LOGERROR("Failed to load symbols from COLLADA conversion DLL");
             dll.Unload();
             return false;
         }
@@ -214 +214 @@
         VfsPaths pathnames;
         if (vfs::GetPathnames(m_VFS, L"art/skeletons/", L"*.xml", pathnames) < 0)
         {
-            LOGERROR(L"No skeleton definition files present");
+            LOGERROR("No skeleton definition files present");
             return false;
         }
 
         bool loaded = false;
         for (VfsPaths::const_iterator it = pathnames.begin(); it != pathnames.end(); ++it)
         {
-            LOGMESSAGE(L"Loading skeleton definitions from '%ls'", it->string().c_str());
+            LOGMESSAGE("Loading skeleton definitions from '%s'", it->string8());
             // Set the filename for the logger to report
             set_logger(ColladaLog, const_cast<void*>(static_cast<const void*>(&(*it))));
 
             CVFSFile skeletonFile;
             if (skeletonFile.Load(m_VFS, *it) != PSRETURN_OK)
             {
-                LOGERROR(L"Failed to read skeleton defintions from '%ls'", it->string().c_str());
+                LOGERROR("Failed to read skeleton defintions from '%s'", it->string8());
                 continue;
             }
 
             int ok = set_skeleton_definitions((const char*)skeletonFile.GetBuffer(), (int)skeletonFile.GetBufferSize());
             if (ok < 0)
             {
-                LOGERROR(L"Failed to load skeleton definitions from '%ls'", it->string().c_str());
+                LOGERROR("Failed to load skeleton definitions from '%s'", it->string8());
                 continue;
             }
 
@@ -243 +243 @@
         }
 
         if (!loaded)
-            LOGERROR(L"Failed to load any skeleton definitions");
+            LOGERROR("Failed to load any skeleton definitions");
 
         return loaded;
     }
@@ -267 +267 @@
             VfsPaths paths;
             if (vfs::GetPathnames(m_VFS, L"art/skeletons/", L"*.xml", paths) != INFO::OK)
             {
-                LOGWARNING(L"Failed to load skeleton definitions");
+                LOGWARNING("Failed to load skeleton definitions");
                 return;
             }
 
@@ -287 +287 @@
                 //  should never happen, unless there really is a problem
                 if (m_VFS->GetFileInfo(*it, &fileInfo) != INFO::OK)
                 {
-                    LOGERROR(L"Failed to stat '%ls' for DAE caching", it->string().c_str());
+                    LOGERROR("Failed to stat '%s' for DAE caching", it->string8());
                 }
                 else
                 {
@@ -298 +298 @@
 
             // Check if we were able to load any skeleton files
             if (m_skeletonHashes.empty())
-                LOGERROR(L"Failed to stat any skeleton definitions for DAE caching");
+                LOGERROR("Failed to stat any skeleton definitions for DAE caching");
                 // We can continue, something else will break if we try loading a skeletal model
 
             m_skeletonHashInvalidated = false;

source/graphics/FontManager.cpp

@@ -59 +59 @@
     const VfsPath fntName(fontName.string() + ".fnt");
     if (g_VFS->LoadFile(path / fntName, buf, size) < 0)
     {
-        LOGERROR(L"Failed to open font file %ls", (path / fntName).string().c_str());
+        LOGERROR("Failed to open font file %s", (path / fntName).string8());
         return false;
     }
     std::istringstream FNTStream(std::string((const char*)buf.get(), size));
@@ -68 +68 @@
     FNTStream >> Version;
     if (Version != 101) // Make sure this is from a recent version of the font builder
     {
-        LOGERROR(L"Font %hs has invalid version", fontName.c_str());
+        LOGERROR("Font %s has invalid version", fontName.c_str());
         return 0;
     }
 
@@ -102 +102 @@
 
         if (Codepoint < 0 || Codepoint > 0xFFFF)
         {
-            LOGWARNING(L"Font %hs has invalid codepoint 0x%x", fontName.c_str(), Codepoint);
+            LOGWARNING("Font %s has invalid codepoint 0x%x", fontName.c_str(), Codepoint);
             continue;
         }
 

source/graphics/LOSTexture.cpp

@@ -82 +82 @@
     
     if (!m_ShaderInitialized)
     {
-        LOGERROR(L"Failed to load SmoothLOS shader, disabling.");
+        LOGERROR("Failed to load SmoothLOS shader, disabling.");
         g_Renderer.m_Options.m_SmoothLOS = false;
         return false;
     }
@@ -163 +163 @@
     GLenum status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"LOS framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("LOS framebuffer object incomplete: 0x%04X", status);
     }
 
     m_smoothShader->BeginPass();

source/graphics/MapGenerator.cpp

@@ -111 +111 @@
     JS::RootedValue settingsVal(cx);
     if (!m_ScriptInterface->ParseJSON(m_Settings, &settingsVal) && settingsVal.isUndefined())
     {
-        LOGERROR(L"CMapGeneratorWorker::Run: Failed to parse settings");
+        LOGERROR("CMapGeneratorWorker::Run: Failed to parse settings");
         return false;
     }
     
@@ -119 +119 @@
     u32 seed;
     if (!m_ScriptInterface->GetProperty(settingsVal, "Seed", seed))
     {   // No seed specified
-        LOGWARNING(L"CMapGeneratorWorker::Run: No seed value specified - using 0");
+        LOGWARNING("CMapGeneratorWorker::Run: No seed value specified - using 0");
         seed = 0;
     }
 
@@ -129 +129 @@
     JS::RootedValue global(cx, m_ScriptInterface->GetGlobalObject());
     if (!m_ScriptInterface->SetProperty(global, "g_MapSettings", settingsVal))
     {
-        LOGERROR(L"CMapGeneratorWorker::Run: Failed to define g_MapSettings");
+        LOGERROR("CMapGeneratorWorker::Run: Failed to define g_MapSettings");
         return false;
     }
 
     // Load RMS
-    LOGMESSAGE(L"Loading RMS '%ls'", m_ScriptPath.string().c_str());
+    LOGMESSAGE("Loading RMS '%s'", m_ScriptPath.string8());
     if (!m_ScriptInterface->LoadGlobalScriptFile(m_ScriptPath))
     {
-        LOGERROR(L"CMapGeneratorWorker::Run: Failed to load RMS '%ls'", m_ScriptPath.string().c_str());
+        LOGERROR("CMapGeneratorWorker::Run: Failed to load RMS '%s'", m_ScriptPath.string8());
         return false;
     }
 
@@ -210 +210 @@
             PSRETURN ret = file.Load(g_VFS, *it);
             if (ret != PSRETURN_OK)
             {
-                LOGERROR(L"CMapGeneratorWorker::GetCivData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+                LOGERROR("CMapGeneratorWorker::GetCivData: Failed to load file '%s': %s", path.string8(), GetErrorString(ret));
             }
             else
             {
@@ -222 +222 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"CMapGeneratorWorker::GetCivData: Error reading directory '%ls': %ls", path.string().c_str(), 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;
@@ -234 +234 @@
     CMapGeneratorWorker* self = static_cast<CMapGeneratorWorker*>(pCxPrivate->pCBData);
     const CParamNode& templateRoot = self->m_TemplateLoader.GetTemplateFileData(templateName).GetChild("Entity");
     if (!templateRoot.IsOk())
-        LOGERROR(L"Invalid template found for '%hs'", templateName.c_str());
+        LOGERROR("Invalid template found for '%s'", templateName.c_str());
     
     return templateRoot;
 }
@@ -271 +271 @@
     {
         for (VfsPaths::iterator it = pathnames.begin(); it != pathnames.end(); ++it)
         {
-            LOGMESSAGE(L"Loading map generator script '%ls'", it->string().c_str());
+            LOGMESSAGE("Loading map generator script '%s'", it->string8());
 
             if (!m_ScriptInterface->LoadGlobalScriptFile(*it))
             {
-                LOGERROR(L"CMapGeneratorWorker::LoadScripts: Failed to load script '%ls'", it->string().c_str());
+                LOGERROR("CMapGeneratorWorker::LoadScripts: Failed to load script '%s'", it->string8());
                 return false;
             }
         }
@@ -284 +284 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"CMapGeneratorWorker::LoadScripts: Error reading scripts in directory '%ls': %ls", path.string().c_str(), 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(L"Failed to load entity template '%ls'", TemplateName.c_str());
+            LOGERROR("Failed to load entity template '%s'", utf8_from_wstring(TemplateName));
         }
         else
         {
@@ -1332 +1332 @@
     //  an error here should stop the loading process
 #define GET_TERRAIN_PROPERTY(val, prop, out)\
     if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
-        {   LOGERROR(L"CMapReader::ParseTerrain() failed to get '%hs' property", #prop);\
+        {   LOGERROR("CMapReader::ParseTerrain() failed to get '%s' property", #prop);\
             throw PSERROR_Game_World_MapLoadFailed("Error parsing terrain data.\nCheck application log for details"); }
 
     JS::RootedValue tmpMapData(cx, m_MapData.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade 
@@ -1411 +1411 @@
     std::vector<Entity> entities;
 
     if (!pSimulation2->GetScriptInterface().GetProperty(tmpMapData, "entities", entities))
-        LOGWARNING(L"CMapReader::ParseEntities() failed to get 'entities' property");
+        LOGWARNING("CMapReader::ParseEntities() failed to get 'entities' property");
 
     CSimulation2& sim = *pSimulation2;
     CmpPtr<ICmpPlayerManager> cmpPlayerManager(sim, SYSTEM_ENTITY);
@@ -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(L"Failed to load entity template '%ls'", currEnt.templateName.c_str());
+            LOGERROR("Failed to load entity template '%s'", utf8_from_wstring(currEnt.templateName));
         }
         else
         {
@@ -1476 +1476 @@
 
 #define GET_ENVIRONMENT_PROPERTY(val, prop, out)\
     if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
-        LOGWARNING(L"CMapReader::ParseEnvironment() failed to get '%hs' property", #prop);
+        LOGWARNING("CMapReader::ParseEnvironment() failed to get '%s' property", #prop);
 
     JS::RootedValue envObj(cx);
     GET_ENVIRONMENT_PROPERTY(tmpMapData, Environment, &envObj)
 
     if (envObj.isUndefined())
     {
-        LOGWARNING(L"CMapReader::ParseEnvironment(): Environment settings not found");
+        LOGWARNING("CMapReader::ParseEnvironment(): Environment settings not found");
         return 0;
     }
 
@@ -1581 +1581 @@
 
 #define GET_CAMERA_PROPERTY(val, prop, out)\
     if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
-        LOGWARNING(L"CMapReader::ParseCamera() failed to get '%hs' property", #prop);
+        LOGWARNING("CMapReader::ParseCamera() failed to get '%s' property", #prop);
 
     JS::RootedValue tmpMapData(cx, m_MapData.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade 
     JS::RootedValue cameraObj(cx);

source/graphics/MapWriter.cpp

@@ -71 +71 @@
     }
     catch (PSERROR_File_WriteFailed&)
     {
-        LOGERROR(L"Failed to write map '%ls'", pathname.string().c_str());
+        LOGERROR("Failed to write map '%s'", pathname.string8());
         return;
     }
 
@@ -447 +447 @@
         }
     }
     if (!XML_StoreVFS(g_VFS, filename))
-        LOGERROR(L"Failed to write map '%ls'", filename.string().c_str());
+        LOGERROR("Failed to write map '%s'", filename.string8());
 }

source/graphics/MeshManager.cpp

@@ -53 +53 @@
 
     if (pmdFilename.empty())
     {
-        LOGERROR(L"Could not load mesh '%ls'", pathname.string().c_str());
+        LOGERROR("Could not load mesh '%s'", pathname.string8());
         return CModelDefPtr();
     }
 
@@ -65 +65 @@
     }
     catch (PSERROR_File&)
     {
-        LOGERROR(L"Could not load mesh '%ls'", pmdFilename.string().c_str());
+        LOGERROR("Could not load mesh '%s'", pmdFilename.string8());
         return CModelDefPtr();
     }
 }

source/graphics/Model.cpp

@@ -473 +473 @@
         if (anim->m_AnimDef && anim->m_AnimDef->GetNumKeys() != m_pModelDef->GetNumBones())
         {
             // mismatch between model's skeleton and animation's skeleton
-            LOGERROR(L"Mismatch between model's skeleton and animation's skeleton (%lu model bones != %lu animation keys)",
+            LOGERROR("Mismatch between model's skeleton and animation's skeleton (%lu model bones != %lu animation keys)",
                     (unsigned long)m_pModelDef->GetNumBones(), (unsigned long)anim->m_AnimDef->GetNumKeys());
             return false;
         }

source/graphics/ModelAbstract.cpp

@@ -57 +57 @@
             {
                 // TODO: unimplemented
                 m_SelectionBox.SetEmpty();
-                LOGWARNING(L"[ModelAbstract] TODO: Cylinder selection boxes are not yet implemented. Use BOX or BOUNDS selection shapes instead.");
+                LOGWARNING("[ModelAbstract] TODO: Cylinder selection boxes are not yet implemented. Use BOX or BOUNDS selection shapes instead.");
             }
             break;
         default:
             {
                 m_SelectionBox.SetEmpty();
-                //LOGWARNING(L"[ModelAbstract] Unrecognized selection shape type: %ld", m_CustomSelectionShape->m_Type);
+                //LOGWARNING("[ModelAbstract] Unrecognized selection shape type: %ld", m_CustomSelectionShape->m_Type);
                 debug_warn("[ModelAbstract] Unrecognized selection shape type");
             }
             break;

source/graphics/ObjectBase.cpp

@@ -90 +90 @@
 
     if (root.GetNodeName() != el_actor)
     {
-        LOGERROR(L"Invalid actor format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
+        LOGERROR("Invalid actor format (unrecognised root element '%s')", XeroFile.GetElementString(root.GetNodeName()).c_str());
         return false;
     }
 
@@ -266 +266 @@
 
             if (currentGroup->size() == 0)
             {
-                LOGERROR(L"Actor group has zero variants ('%ls')", pathname.string().c_str());
+                LOGERROR("Actor group has zero variants ('%s')", pathname.string8());
             }
 
             ++currentGroup;

source/graphics/ObjectEntry.cpp

@@ -73 +73 @@
         str << variation.color;
         int r, g, b;
         if (! (str >> r >> g >> b)) // Any trailing data is ignored
-            LOGERROR(L"Actor '%ls' has invalid RGB colour '%hs'", 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);
     }
@@ -119 +119 @@
     CModelDefPtr modeldef (objectManager.GetMeshManager().GetMesh(m_ModelName));
     if (!modeldef)
     {
-        LOGERROR(L"CObjectEntry::BuildVariation(): Model %ls failed to load", m_ModelName.string().c_str());
+        LOGERROR("CObjectEntry::BuildVariation(): Model %s failed to load", m_ModelName.string8());
         return false;
     }
 
@@ -133 +133 @@
     
     if (m_Samplers.size() == 0)
     {
-        LOGERROR(L"Actor '%ls' 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;
@@ -190 +190 @@
     {
         // start up idling
         if (!model->SetAnimation(GetRandomAnimation("idle")))
-            LOGERROR(L"Failed to set idle animation in model \"%ls\"", m_ModelName.string().c_str());
+            LOGERROR("Failed to set idle animation in model \"%s\"", m_ModelName.string8());
     }
 
     // build props - TODO, RC - need to fix up bounds here
@@ -209 +209 @@
         CObjectEntry* oe = objectManager.FindObjectVariation(prop.m_ModelName.c_str(), selections);
         if (!oe)
         {
-            LOGERROR(L"Failed to build prop model \"%ls\" on actor \"%ls\"", 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(L"Failed to find matching prop point called \"%hs\" in model \"%ls\" for actor \"%ls\"", ppn.c_str(), m_ModelName.string().c_str(), 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(L"CObjectManager::FindObjectBase(): Cannot find object '%ls'", objectname.c_str());
+    LOGERROR("CObjectManager::FindObjectBase(): Cannot find object '%s'", utf8_from_wstring(objectname));
 
     return 0;
 }

source/graphics/ParticleEmitterType.cpp

@@ -329 +329 @@
     if (name == "color.r")          return VAR_COLOR_R;
     if (name == "color.g")          return VAR_COLOR_G;
     if (name == "color.b")          return VAR_COLOR_B;
-    LOGWARNING(L"Particle sets unknown variable '%hs'", name.c_str());
+    LOGWARNING("Particle sets unknown variable '%s'", name.c_str());
     return -1;
 }
 

source/graphics/ShaderManager.cpp

@@ -49 +49 @@
         TIMER_ACCRUE(tc_ShaderValidation);
         CVFSFile grammar;
         if (grammar.Load(g_VFS, L"shaders/program.rng") != PSRETURN_OK)
-            LOGERROR(L"Failed to read grammar shaders/program.rng");
+            LOGERROR("Failed to read grammar shaders/program.rng");
         else
         {
             if (!m_Validator.LoadGrammar(grammar.GetAsString()))
-                LOGERROR(L"Failed to load grammar shaders/program.rng");
+                LOGERROR("Failed to load grammar shaders/program.rng");
         }
     }
 #endif
@@ -77 +77 @@
     CShaderProgramPtr program;
     if (!NewProgram(name, defines, program))
     {
-        LOGERROR(L"Failed to load shader '%hs'", name);
+        LOGERROR("Failed to load shader '%s'", name);
         program = CShaderProgramPtr();
     }
 
@@ -378 +378 @@
     CShaderTechniquePtr tech(new CShaderTechnique());
     if (!NewEffect(name.c_str(), defines, tech))
     {
-        LOGERROR(L"Failed to load effect '%hs'", name.c_str());
+        LOGERROR("Failed to load effect '%s'", name.c_str());
         tech = CShaderTechniquePtr();
     }
 

source/graphics/ShaderProgram.cpp

@@ -71 +71 @@
             glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos);
             int errLine = std::count(code.begin(), code.begin() + std::min((int)code.length(), errPos + 1), '\n') + 1;
             char* errStr = (char*)glGetString(GL_PROGRAM_ERROR_STRING_ARB);
-            LOGERROR(L"Failed to compile %hs program '%ls' (line %d):\n%hs", targetName, file.string().c_str(), errLine, errStr);
+            LOGERROR("Failed to compile %s program '%s' (line %d):\n%s", targetName, file.string8(), errLine, errStr);
             return false;
         }
 
@@ -310 +310 @@
             pglGetShaderInfoLog(shader, length, NULL, infolog);
 
             if (ok)
-                LOGMESSAGE(L"Info when compiling shader '%ls':\n%hs", file.string().c_str(), infolog);
+                LOGMESSAGE("Info when compiling shader '%s':\n%s", file.string8(), infolog);
             else
-                LOGERROR(L"Failed to compile shader '%ls':\n%hs", file.string().c_str(), infolog);
+                LOGERROR("Failed to compile shader '%s':\n%s", file.string8(), infolog);
 
             delete[] infolog;
         }
@@ -357 +357 @@
             pglGetProgramInfoLog(m_Program, length, NULL, infolog);
 
             if (ok)
-                LOGMESSAGE(L"Info when linking program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
+                LOGMESSAGE("Info when linking program '%s'+'%s':\n%s", m_VertexFile.string8(), m_FragmentFile.string8(), infolog);
             else
-                LOGERROR(L"Failed to link program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
+                LOGERROR("Failed to link program '%s'+'%s':\n%s", m_VertexFile.string8(), m_FragmentFile.string8(), infolog);
             
             delete[] infolog;
         }
@@ -561 +561 @@
             else if (id.second == GL_FLOAT_VEC4)
                 pglUniform4fARB(id.first, v0, v1, v2, v3);
             else
-                LOGERROR(L"CShaderProgramGLSL::Uniform(): Invalid uniform type (expected float, vec2, vec3, vec4)");
+                LOGERROR("CShaderProgramGLSL::Uniform(): Invalid uniform type (expected float, vec2, vec3, vec4)");
         }
     }
 
@@ -572 +572 @@
             if (id.second == GL_FLOAT_MAT4)
                 pglUniformMatrix4fvARB(id.first, 1, GL_FALSE, &v._11);
             else
-                LOGERROR(L"CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
+                LOGERROR("CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
         }
     }
 
@@ -583 +583 @@
             if (id.second == GL_FLOAT_MAT4)
                 pglUniformMatrix4fvARB(id.first, count, GL_FALSE, &v->_11);
             else
-                LOGERROR(L"CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
+                LOGERROR("CShaderProgramGLSL::Uniform(): Invalid uniform type (expected mat4)");
         }
     }
 
@@ -663 +663 @@
     const std::map<CStrIntern, int>& UNUSED(vertexIndexes), const std::map<CStrIntern, frag_index_pair_t>& UNUSED(fragmentIndexes),
     int UNUSED(streamflags))
 {
-    LOGERROR(L"CShaderProgram::ConstructARB: '%ls'+'%ls': ARB shaders not supported on this device",
+    LOGERROR("CShaderProgram::ConstructARB: '%s'+'%s': ARB shaders not supported on this device",
         vertexFile.string().c_str(), fragmentFile.string().c_str());
     return NULL;
 }

source/graphics/ShaderProgramFFP.cpp

@@ -1159 +1159 @@
     if (id == "model_solid_tex")
         return new CShaderProgramFFP_ModelSolidTex(defines);
 
-    LOGERROR(L"CShaderProgram::ConstructFFP: '%hs': Invalid id", id.c_str());
+    LOGERROR("CShaderProgram::ConstructFFP: '%s': Invalid id", id.c_str());
     debug_warn(L"CShaderProgram::ConstructFFP: Invalid id");
     return NULL;
 }

source/graphics/SkeletonAnimManager.cpp

@@ -65 +65 @@
 
     if (psaFilename.empty())
     {
-        LOGERROR(L"Could not load animation '%ls'", pathname.string().c_str());
+        LOGERROR("Could not load animation '%s'", pathname.string8());
         def = NULL;
     }
     else
@@ -76 +76 @@
         }
         catch (PSERROR_File&)
         {
-            LOGERROR(L"Could not load animation '%ls'", psaFilename.string().c_str());
+            LOGERROR("Could not load animation '%s'", psaFilename.string8());
         }
     }
 
     if (def)
-        LOGMESSAGE(L"CSkeletonAnimManager::GetAnimation(%ls): Loaded successfully", pathname.string().c_str());
+        LOGMESSAGE("CSkeletonAnimManager::GetAnimation(%s): Loaded successfully", pathname.string8());
     else
-        LOGERROR(L"CSkeletonAnimManager::GetAnimation(%ls): Failed loading, marked file as bad", pathname.string().c_str());
+        LOGERROR("CSkeletonAnimManager::GetAnimation(%s): Failed loading, marked file as bad", pathname.string8());
 
     // Add to map
     m_Animations[name] = def; // NULL if failed to load - we won't try loading it again

source/graphics/TerrainProperties.cpp

@@ -55 +55 @@
     // Check that we've got the right kind of xml document
     if (rootName != "Terrains")
     {
-        LOGERROR(
-            L"TerrainProperties: Loading %ls: Root node is not terrains (found \"%hs\")",
-            pathname.string().c_str(),
-            rootName.c_str());
+        LOGERROR("TerrainProperties: Loading %s: Root node is not terrains (found \"%s\")",
+            pathname.string8(),
+            rootName);
         return CTerrainPropertiesPtr();
     }
     
@@ -80 +79 @@
         }
         else
         {
-            LOGWARNING(
-                L"TerrainProperties: Loading %ls: Unexpected node %hs\n",
-                pathname.string().c_str(),
-                XeroFile.GetElementString(child.GetNodeName()).c_str());
+            LOGWARNING("TerrainProperties: Loading %s: Unexpected node %s\n",
+                pathname.string8(),
+                XeroFile.GetElementString(child.GetNodeName()));
             // Keep reading - typos shouldn't be showstoppers
         }
     }

source/graphics/TerrainTextureEntry.cpp

@@ -47 +47 @@
     CXeromyces XeroFile;
     if (XeroFile.Load(g_VFS, path) != PSRETURN_OK)
     {
-        LOGERROR(L"Terrain xml not found (%hs)", path.string().c_str());
+        LOGERROR("Terrain xml not found (%s)", path.string8());
         return;
     }
 
@@ -70 +70 @@
 
     if (root.GetNodeName() != el_terrain)
     {
-        LOGERROR(L"Invalid terrain format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
+        LOGERROR("Invalid terrain format (unrecognised root element '%s')", XeroFile.GetElementString(root.GetNodeName()).c_str());
         return;
     }
     
@@ -253 +253 @@
         if (textures[i] < 0)
         {
             g_TexMan.m_TerrainAlphas.erase(it);
-            LOGERROR((L"Failed to load alphamap: " + amtype.string()).c_str());
+            LOGERROR("Failed to load alphamap: %s", amtype.string8());
             
             VfsPath standard("standard");
             if (path != standard)
@@ -362 +362 @@
     result.m_hCompositeAlphaMap = hCompositeAlphaMap;
     
     m_TerrainAlpha = it;
-}
- No newline at end of file
+}

source/graphics/TerrainTextureManager.cpp

@@ -89 +89 @@
             return m_TextureEntries[i];
     }
 
-    LOGWARNING(L"CTerrainTextureManager: Couldn't find terrain %hs", tag.c_str());
+    LOGWARNING("CTerrainTextureManager: Couldn't find terrain %s", tag.c_str());
     return 0;
 }
 
@@ -141 +141 @@
 
 void CTerrainTextureManager::RecurseDirectory(const CTerrainPropertiesPtr& parentProps, const VfsPath& path)
 {
-    //LOGMESSAGE(L"CTextureManager::RecurseDirectory(%ls)", path.string().c_str());
+    //LOGMESSAGE("CTextureManager::RecurseDirectory(%s)", path.string8());
 
     CTerrainPropertiesPtr props;
 
@@ -153 +153 @@
     // No terrains.xml, or read failures -> use parent props (i.e. 
     if (!props)
     {
-        LOGMESSAGE(L"CTerrainTextureManager::RecurseDirectory(%ls): no terrains.xml (or errors while loading) - using parent properties", path.string().c_str());
+        LOGMESSAGE("CTerrainTextureManager::RecurseDirectory(%s): no terrains.xml (or errors while loading) - using parent properties", path.string8());
         props = parentProps;
     }
 

source/graphics/TextRenderer.cpp

@@ -144 +144 @@
     PutString(x, y, new std::wstring(buf), true);
 }
 
+void CTextRenderer::Put(float x, float y, const char* buf)
+{
+    if (buf[0] == 0)
+        return; // empty string; don't bother storing
+
+    PutString(x, y, new std::wstring(wstring_from_utf8(buf)), true);
+}
+
 void CTextRenderer::Put(float x, float y, const std::wstring* buf)
 {
     if (buf->empty())

source/graphics/TextRenderer.h

@@ -91 +91 @@
     /**
      * Print text at (x,y) under the current transform.
      * Does not alter the current transform.
+     * @p buf must be a UTF-8 string.
+     */
+    void Put(float x, float y, const char* buf);
+
+    /**
+     * Print text at (x,y) under the current transform.
+     * Does not alter the current transform.
      * @p buf must remain valid until Render() is called.
      * (This should be used to minimise memory copies when possible.)
      */

source/graphics/TextureConverter.cpp

@@ -120 +120 @@
 
     if (root.GetNodeName() != el_textures)
     {
-        LOGERROR(L"Invalid texture settings file \"%ls\" (unrecognised root element)", path.string().c_str());
+        LOGERROR("Invalid texture settings file \"%s\" (unrecognised root element)", path.string8());
         return NULL;
     }
 
@@ -152 +152 @@
                     else if (v == "alpha")
                         p.settings.format = FMT_ALPHA;
                     else
-                        LOGERROR(L"Invalid attribute value <file format='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file format='%s'>", v.c_str());
                 }
                 else if (attr.Name == at_mipmap)
                 {
@@ -162 +162 @@
                     else if (v == "false")
                         p.settings.mipmap = MIP_FALSE;
                     else
-                        LOGERROR(L"Invalid attribute value <file mipmap='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file mipmap='%s'>", v.c_str());
                 }
                 else if (attr.Name == at_normal)
                 {
@@ -172 +172 @@
                     else if (v == "false")
                         p.settings.normal = NORMAL_FALSE;
                     else
-                        LOGERROR(L"Invalid attribute value <file normal='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file normal='%s'>", v.c_str());
                 }
                 else if (attr.Name == at_alpha)
                 {
@@ -184 +184 @@
                     else if (v == "transparency")
                         p.settings.alpha = ALPHA_TRANSPARENCY;
                     else
-                        LOGERROR(L"Invalid attribute value <file alpha='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file alpha='%s'>", v.c_str());
                 }
                 else if (attr.Name == at_filter)
                 {
@@ -196 +196 @@
                     else if (v == "kaiser")
                         p.settings.filter = FILTER_KAISER;
                     else
-                        LOGERROR(L"Invalid attribute value <file filter='%hs'>", v.c_str());
+                        LOGERROR("Invalid attribute value <file filter='%s'>", v.c_str());
                 }
                 else if (attr.Name == at_kaiserwidth)
                 {
@@ -212 +212 @@
                 }
                 else
                 {
-                    LOGERROR(L"Invalid attribute name <file %hs='...'>", XeroFile.GetAttributeString(attr.Name).c_str());
+                    LOGERROR("Invalid attribute name <file %s='...'>", XeroFile.GetAttributeString(attr.Name).c_str());
                 }
             }
 
@@ -326 +326 @@
     size_t fileSize;
     if (m_VFS->LoadFile(src, file, fileSize) < 0)
     {
-        LOGERROR(L"Failed to load texture \"%ls\"", src.string().c_str());
+        LOGERROR("Failed to load texture \"%s\"", src.string8());
         return false;
     }
 
     Tex tex;
     if (tex.decode(file, fileSize) < 0)
     {
-        LOGERROR(L"Failed to decode texture \"%ls\"", src.string().c_str());
+        LOGERROR("Failed to decode texture \"%s\"", src.string8());
         return false;
     }
 
@@ -345 +345 @@
         // Convert to uncompressed 8-bit with no mipmaps
         if (tex.transform_to((tex.m_Flags | TEX_GREY) & ~(TEX_DXT | TEX_MIPMAPS | TEX_ALPHA)) < 0)
         {
-            LOGERROR(L"Failed to transform texture \"%ls\"", src.string().c_str());
+            LOGERROR("Failed to transform texture \"%s\"", src.string8());
             return false;
         }
     }
@@ -356 +356 @@
         // (plain_transform doesn't know how to construct the alpha channel)
         if (tex.m_Flags & TEX_GREY)
         {
-            LOGERROR(L"Failed to convert grayscale texture \"%ls\" - only RGB textures are currently supported", src.string().c_str());
+            LOGERROR("Failed to convert grayscale texture \"%s\" - only RGB textures are currently supported", src.string8());
             return false;
         }
 
         // Convert to uncompressed BGRA with no mipmaps
         if (tex.transform_to((tex.m_Flags | TEX_BGR | TEX_ALPHA) & ~(TEX_DXT | TEX_MIPMAPS)) < 0)
         {
-            LOGERROR(L"Failed to transform texture \"%ls\"", src.string().c_str());
+            LOGERROR("Failed to transform texture \"%s\"", src.string8());
             return false;
         }
     }
@@ -482 +482 @@
     return true;
 
 #else
-    LOGERROR(L"Failed to convert texture \"%ls\" (NVTT not available)", src.string().c_str());
+    LOGERROR("Failed to convert texture \"%s\" (NVTT not available)", src.string8());
     return false;
 #endif
 }

source/graphics/TextureManager.cpp

@@ -178 +178 @@
         Handle h = ogl_tex_load(m_VFS, path, RES_UNIQUE);
         if (h <= 0)
         {
-            LOGERROR(L"Texture failed to load; \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("Texture failed to load; \"%s\"", texture->m_Properties.m_Path.string8());
 
             // Replace with error texture to make it obvious
             texture->SetHandle(m_ErrorHandle);
@@ -218 +218 @@
         // Upload to GL
         if (!m_DisableGL && ogl_tex_upload(h, texture->m_Properties.m_Format) < 0)
         {
-            LOGERROR(L"Texture failed to upload: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("Texture failed to upload: \"%s\"", texture->m_Properties.m_Path.string8());
 
             ogl_tex_free(h);
 
@@ -277 +277 @@
 
             // No source file or archive cache was found, so we can't load the
             // real texture at all - return the error texture instead
-            LOGERROR(L"CCacheLoader failed to find archived or source file for: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("CCacheLoader failed to find archived or source file for: \"%s\"", texture->m_Properties.m_Path.string8());
             texture->SetHandle(m_ErrorHandle);
             return true;
         }
@@ -299 +299 @@
         PrepareCacheKey(texture, hash, version);
         VfsPath looseCachePath = m_CacheLoader.LooseCachePath(sourcePath, hash, version);
 
-//      LOGWARNING(L"Converting texture \"%ls\"", srcPath.c_str());
+//      LOGWARNING("Converting texture \"%s\"", srcPath.c_str());
 
         CTextureConverter::Settings settings = GetConverterSettings(texture);
 
@@ -345 +345 @@
                 }
                 else
                 {
-                    LOGERROR(L"Texture failed to convert: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+                    LOGERROR("Texture failed to convert: \"%s\"", texture->m_Properties.m_Path.string8());
                     texture->SetHandle(m_ErrorHandle);
                 }
                 texture->m_State = CTexture::LOADED;

source/graphics/scripting/JSInterface_GameView.cpp

@@ -28 +28 @@
 { \
     if (!g_Game || !g_Game->GetView()) \
     { \
-        LOGERROR(L"Trying to get a setting from GameView when it's not initialized!"); \
+        LOGERROR("Trying to get a setting from GameView when it's not initialized!"); \
         return false; \
     } \
     return g_Game->GetView()->Get##NAME##Enabled(); \
@@ -38 +38 @@
 { \
     if (!g_Game || !g_Game->GetView()) \
     { \
-        LOGERROR(L"Trying to set a setting of GameView when it's not initialized!"); \
+        LOGERROR("Trying to set a setting of GameView when it's not initialized!"); \
         return; \
     } \
     g_Game->GetView()->Set##NAME##Enabled(Enabled); \

source/graphics/tests/test_MeshManager.h

@@ -190 +190 @@
 
         CModelDefPtr modeldef = meshManager->GetMesh(testDAE);
         TS_ASSERT(! modeldef);
-        TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"parser error");
+        TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "parser error");
     }
 
     void test_invalid_dae()
@@ -205 +205 @@
 
         CModelDefPtr modeldef = meshManager->GetMesh(testDAE);
         TS_ASSERT(! modeldef);
-        TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"parser error");
+        TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "parser error");
     }
 
     void test_load_nonexistent_pmd()

source/gui/CGUI.cpp

@@ -380 +380 @@
     }
     catch (PSERROR_GUI& e)
     {
-        LOGERROR(L"GUI draw error: %hs", e.what());
+        LOGERROR("GUI draw error: %s", e.what());
     }
 }
 
@@ -969 +969 @@
     }
     catch (PSERROR_GUI& e)
     {
-        LOGERROR(L"Errors loading GUI file %ls (%u)", Filename.string().c_str(), e.getCode());
+        LOGERROR("Errors loading GUI file %s (%u)", Filename.string8(), e.getCode());
         return;
     }
 }
@@ -1091 +1091 @@
     if (!object)
     {
         // Report error that object was unsuccessfully loaded
-        LOGERROR(L"GUI: Unrecognized object type \"%hs\"", type.c_str());
+        LOGERROR("GUI: Unrecognized object type \"%s\"", type.c_str());
         return;
     }
 
@@ -1133 +1133 @@
     {
         // additional check
         if (m_Styles.count(argStyle) == 0)
-            LOGERROR(L"GUI: Trying to use style '%hs' that doesn't exist.", argStyle.c_str());
+            LOGERROR("GUI: Trying to use style '%s' that doesn't exist.", argStyle.c_str());
         else
             object->LoadStyle(*this, argStyle);
     }
@@ -1185 +1185 @@
         // Try setting the value
         if (object->SetSetting(pFile->GetAttributeString(attr.Name), attr.Value.FromUTF8(), true) != PSRETURN_OK)
         {
-            LOGERROR(L"GUI: (object: %hs) Can't set \"%hs\" to \"%ls\"", 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(L"Error opening GUI script action file '%ls'", filename.c_str());
+                    LOGERROR("Error opening GUI script action file '%s'", utf8_from_wstring(filename));
                     throw PSERROR_GUI_JSOpenFailed();
                 }
 
@@ -1293 +1293 @@
             CStr attributeName(child.GetAttributes().GetNamedItem(attr_id)); // Read the attribute name.
             if (attributeName.empty())
             {
-                LOGERROR(L"GUI: ‘translatableAttribute’ XML element with empty ‘id’ XML attribute found. (object: %hs)", object->GetPresentableName().c_str());
+                LOGERROR("GUI: ‘translatableAttribute’ XML element with empty ‘id’ XML attribute found. (object: %s)", object->GetPresentableName().c_str());
                 continue;
             }
 
@@ -1320 +1320 @@
             CStr attributeName(child.GetAttributes().GetNamedItem(attr_id)); // Read the attribute name.
             if (attributeName.empty())
             {
-                LOGERROR(L"GUI: ‘attribute’ XML element with empty ‘id’ XML attribute found. (object: %hs)", object->GetPresentableName().c_str());
+                LOGERROR("GUI: ‘attribute’ XML element with empty ‘id’ XML attribute found. (object: %s)", object->GetPresentableName().c_str());
                 continue;
             }
 
@@ -1348 +1348 @@
             if (!filename.empty())
             {
                 if (!directory.empty())
-                    LOGWARNING(L"GUI: Include element found with file name (%ls) and directory name (%ls). 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(L"GUI: Error reading included XML: '%ls'", 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(L"GUI: Error reading included XML: '%ls', 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);
@@ -1379 +1379 @@
                     CXeromyces XeroIncluded;
                     if (XeroIncluded.Load(g_VFS, *it) != PSRETURN_OK)
                     {
-                        LOGERROR(L"GUI: Error reading included XML: '%ls'", (*it).string().c_str());
+                        LOGERROR("GUI: Error reading included XML: '%s'", (*it).string8());
                         continue;
                     }
 
                     XMBElement node = XeroIncluded.GetRoot();
                     if (node.GetNodeName() != XeroIncluded.GetElementID("object"))
                     {
-                        LOGERROR(L"GUI: Error reading included XML: '%ls', root element must have be of type 'object'.", (*it).string().c_str());
+                        LOGERROR("GUI: Error reading included XML: '%s', root element must have be of type 'object'.", (*it).string8());
                         continue;
                     }
                     Xeromyces_ReadObject(node, &XeroIncluded, object, NameSubst, Paths, nesting_depth+1);
@@ -1394 +1394 @@
 
             }
             else
-                LOGERROR(L"GUI: 'include' XML element must have valid 'file' or 'directory' attribute found. (object %hs)", object->GetPresentableName().c_str());
+                LOGERROR("GUI: 'include' XML element must have valid 'file' or 'directory' attribute found. (object %s)", object->GetPresentableName().c_str());
         }
         else
         {
             // Try making the object read the tag.
             if (!object->HandleAdditionalChildren(child, pFile))
             {
-                LOGERROR(L"GUI: (object: %hs) Reading unknown children for its type", object->GetPresentableName().c_str());
+                LOGERROR("GUI: (object: %s) Reading unknown children for its type", object->GetPresentableName().c_str());
             }
         }
     } 
@@ -1442 +1442 @@
     }
     catch (PSERROR_GUI& e)
     {
-        LOGERROR(L"GUI error: %hs", e.what());
+        LOGERROR("GUI error: %s", e.what());
     }
 }
 
@@ -1491 +1491 @@
         }
         catch (PSERROR_Scripting& e)
         {
-            LOGERROR(L"GUI: Error executing script %ls: %hs", file.c_str(), e.what());
+            LOGERROR("GUI: Error executing script %s: %s", utf8_from_wstring(file), e.what());
         }
     }
 
@@ -1512 +1512 @@
                 }
                 catch (PSERROR_Scripting& e)
                 {
-                    LOGERROR(L"GUI: Error executing script %ls: %hs", (*it).string().c_str(), e.what());
+                    LOGERROR("GUI: Error executing script %s: %s", (*it).string8(), e.what());
                 }
             }
         }
@@ -1527 +1527 @@
     }
     catch (PSERROR_Scripting& e)
     {
-        LOGERROR(L"GUI: Error executing inline script: %hs", e.what());
+        LOGERROR("GUI: Error executing inline script: %s", e.what());
     }
 }
 
@@ -1547 +1547 @@
     name = Element.GetAttributes().GetNamedItem( pFile->GetAttributeID("name") );
 
     if (m_Sprites.find(name) != m_Sprites.end())
-        LOGWARNING(L"GUI sprite name '%hs' used more than once; first definition will be discarded", name.c_str());
+        LOGWARNING("GUI sprite name '%s' used more than once; first definition will be discarded", name.c_str());
 
     //
     //  Read Children (the images)
@@ -1573 +1573 @@
         {
             if (effects)
             {
-                LOGERROR(L"GUI <sprite> must not have more than one <effect>");
+                LOGERROR("GUI <sprite> must not have more than one <effect>");
             }
             else
             {
@@ -1636 +1636 @@
         {
             CClientArea ca;
             if (!GUI<CClientArea>::ParseString(attr_value, ca))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%ls\")", 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
@@ -1739 +1739 @@
         {
             if (Image->m_Effects)
             {
-                LOGERROR(L"GUI <image> must not have more than one <effect>");
+                LOGERROR("GUI <image> must not have more than one <effect>");
             }
             else
             {
@@ -1773 +1773 @@
         {
             CColor color;
             if (!GUI<int>::ParseColor(attr_value, color, 0))
-                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", 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(L"GUI: Error parsing '%hs' (\"%hs\")", 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(L"GUI: Error parsing '%hs' (\"%hs\")", 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(L"GUI: Error parsing '%hs' (\"%hs\")", 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(L"GUI: Error parsing '%hs' (\"%hs\")", 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(L"Error parsing '%hs' (\"%hs\") 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(L"GUI: Error parsing '%hs' (\"%hs\") 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;
         }
@@ -2013 +2013 @@
         // Try setting color to value
         if (!color.ParseString(value))
         {
-            LOGERROR(L"GUI: Unable to create custom color '%hs'. Invalid color syntax.", name.c_str());
+            LOGERROR("GUI: Unable to create custom color '%s'. Invalid color syntax.", name.c_str());
         }
         else
         {

source/gui/CGUIScrollBarVertical.cpp

@@ -51 +51 @@
 {
     if (!GetStyle())
     {
-        LOGWARNING(L"Attempt to draw scrollbar without a style.");
+        LOGWARNING("Attempt to draw scrollbar without a style.");
         return;
     }
 

source/gui/COList.cpp

@@ -158 +158 @@
             {
                 CColor color;
                 if (!GUI<CColor>::ParseString(attr_value.FromUTF8(), color))
-                    LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                    LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
                 else oDef.m_TextColor = color;
             }
             else if (attr_name == "id")
@@ -169 +169 @@
             {
                 float width;
                 if (!GUI<float>::ParseString(attr_value.FromUTF8(), width))
-                    LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+                    LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str());
                 else
                 {
                     // Check if it's a relative value, and save as decimal if so.
@@ -215 +215 @@
                 }
                 else // Ignore.
                 {
-                    LOGERROR(L"GUI: translatable attribute in olist def that isn't a heading. (object: %hs)", this->GetPresentableName().c_str());
+                    LOGERROR("GUI: translatable attribute in olist def that isn't a heading. (object: %s)", this->GetPresentableName().c_str());
                 }
             }
         }

source/gui/GUIManager.cpp

@@ -117 +117 @@
         scriptInterface->ReadStructuredClone(initDataClone, &initDataVal);
     else
     {
-        LOGERROR(L"Called PopPageCB when initData (which should contain the callback function name) isn't set!");
+        LOGERROR("Called PopPageCB when initData (which should contain the callback function name) isn't set!");
         return;
     }
     
     if (!scriptInterface->HasProperty(initDataVal, "callback"))
     {
-        LOGERROR(L"Called PopPageCB when the callback function name isn't set!");
+        LOGERROR("Called PopPageCB when the callback function name isn't set!");
         return;
     }
     
     std::string callback;
     if (!scriptInterface->GetProperty(initDataVal, "callback", callback))
     {
-        LOGERROR(L"Failed to get the callback property as a string from initData in PopPageCB!");
+        LOGERROR("Failed to get the callback property as a string from initData in PopPageCB!");
         return;
     }
     
     JS::RootedValue global(cx, scriptInterface->GetGlobalObject());
     if (!scriptInterface->HasProperty(global, callback.c_str()))
     {
-        LOGERROR(L"The specified callback function %hs does not exist in the page %ls", 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(L"Failed to call the callback function %hs in the page %ls", 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(L"GUI page '%ls' 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(L"GUI page '%ls' 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(L"GUI page '%ls': 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(L"GUI file '%ls' changed - reloading page '%ls'", path.string().c_str(), 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
         }
@@ -407 +407 @@
 {
     const CParamNode& templateRoot = m_TemplateLoader.GetTemplateFileData(templateName).GetChild("Entity");
     if (!templateRoot.IsOk())
-        LOGERROR(L"Invalid template found for '%hs'", templateName.c_str());
+        LOGERROR("Invalid template found for '%s'", templateName.c_str());
 
     return templateRoot;
 }

source/gui/GUIRenderer.cpp

@@ -144 +144 @@
             // Check colour is valid
             if (!GUI<CColor>::ParseString(value, color))
             {
-                LOGERROR(L"GUI: Error parsing sprite 'colour' (\"%ls\")", value.c_str());
+                LOGERROR("GUI: Error parsing sprite 'colour' (\"%s\")", utf8_from_wstring(value));
                 return;
             }
 
@@ -167 +167 @@
         else
         {
             // Otherwise, just complain and give up:
-            LOGERROR(L"Trying to use a sprite that doesn't exist (\"%hs\").", SpriteName.c_str());
+            LOGERROR("Trying to use a sprite that doesn't exist (\"%s\").", SpriteName.c_str());
             return;
         }
     }

source/gui/GUITooltip.cpp

@@ -149 +149 @@
     IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
     if (! tooltipobj)
     {
-        LOGERROR(L"Cannot find tooltip named '%hs'", style.c_str());
+        LOGERROR("Cannot find tooltip named '%s'", style.c_str());
         return;
     }
 
@@ -162 +162 @@
         usedobj = gui->FindObjectByName(usedObjectName);
         if (! usedobj)
         {
-            LOGERROR(L"Cannot find object named '%hs' used by tooltip '%hs'", usedObjectName.c_str(), style.c_str());
+            LOGERROR("Cannot find object named '%s' used by tooltip '%s'", usedObjectName.c_str(), style.c_str());
             return;
         }
 
@@ -213 +213 @@
     IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
     if (! tooltipobj)
     {
-        LOGERROR(L"Cannot find tooltip named '%hs'", style.c_str());
+        LOGERROR("Cannot find tooltip named '%s'", style.c_str());
         return;
     }
 
@@ -224 +224 @@
         IGUIObject* usedobj = gui->FindObjectByName(usedObjectName);
         if (! usedobj)
         {
-            LOGERROR(L"Cannot find object named '%hs' used by tooltip '%hs'", usedObjectName.c_str(), style.c_str());
+            LOGERROR("Cannot find object named '%s' used by tooltip '%s'", usedObjectName.c_str(), style.c_str());
             return;
         }
 
@@ -254 +254 @@
     IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
     if (! tooltipobj)
     {
-        LOGERROR(L"Cannot find tooltip object named '%hs'", style.c_str());
+        LOGERROR("Cannot find tooltip object named '%s'", style.c_str());
         return delay;
     }
     GUI<int>::GetSetting(tooltipobj, "delay", delay);

source/gui/GUIbase.cpp

@@ -113 +113 @@
             coord++;
             break;
         default:
-            LOGWARNING(L"ClientArea definitions may only contain numerics. Your input: '%hs'", Value.c_str());
+            LOGWARNING("ClientArea definitions may only contain numerics. Your input: '%s'", Value.c_str());
             return false;
         }
         if (coord > 3)
         {
-            LOGWARNING(L"Too many CClientArea parameters (4 max). Your input: '%hs'", Value.c_str());
+            LOGWARNING("Too many CClientArea parameters (4 max). Your input: '%s'", Value.c_str());
             return false;
         }
     }
 
     if (coord < 3)
     {
-        LOGWARNING(L"Too few CClientArea parameters (4 min). Your input: '%hs'", Value.c_str());
+        LOGWARNING("Too few CClientArea parameters (4 min). Your input: '%s'", Value.c_str());
         return false;
     }
 

source/gui/GUItext.cpp

@@ -109 +109 @@
             if (!pGUI->IconExists(path))
             {
                 if (pObject)
-                    LOGERROR(L"Trying to use an icon, imgleft or imgright-tag with an undefined icon (\"%hs\").", path.c_str());
+                    LOGERROR("Trying to use an icon, imgleft or imgright-tag with an undefined icon (\"%s\").", path.c_str());
                 continue;
             }
 
@@ -158 +158 @@
                             CSize displacement;
                             // Parse the value
                             if (!GUI<CSize>::ParseString(tagAttrib.value, displacement))
-                                LOGERROR(L"Error parsing 'displace' value for tag [ICON]");
+                                LOGERROR("Error parsing 'displace' value for tag [ICON]");
                             else
                                 SpriteCall.m_Area += displacement;
                         }
@@ -182 +182 @@
                 }
                 break;
             default:
-                LOGERROR(L"Encountered unexpected tag applied to text");
+                LOGERROR("Encountered unexpected tag applied to text");
                 break;
             }
         }
@@ -207 +207 @@
 
                     if (!GUI<CColor>::ParseString(it2->m_TagValue, TextCall.m_Color)
                         && pObject)
-                        LOGERROR(L"Error parsing the value of a [color]-tag in GUI text when reading object \"%hs\".", pObject->GetPresentableName().c_str());
+                        LOGERROR("Error parsing the value of a [color]-tag in GUI text when reading object \"%s\".", pObject->GetPresentableName().c_str());
                     break;
                 case CGUIString::TextChunk::Tag::TAG_FONT:
                     // TODO Gee: (2004-08-15) Check if Font exists?
                     TextCall.m_Font = CStrIntern(utf8_from_wstring(it2->m_TagValue));
                     break;
                 default:
-                    LOGERROR(L"Encountered unexpected tag applied to text");
+                    LOGERROR("Encountered unexpected tag applied to text");
                     break;
                 }
             }
@@ -306 +306 @@
             closing = false;
             if (++p == l)
             {
-                LOGERROR(L"Partial tag at end of string '%ls'", 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(L"Encountered closing tag without having any open tags. At %d in '%ls'", 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(L"Partial closing tag at end of string '%ls'", 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(L"Closing tags do not support parameters (at pos %d '%ls')", 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(L"Parameter without value at pos %d '%ls'", 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(L"Closing tags do not support parameters (at pos %d '%ls')", p, str.c_str());
+                        LOGERROR("Closing tags do not support parameters (at pos %d '%s')", p, utf8_from_wstring(str));
 
                     if (++p == l)
                     {
-                        LOGERROR(L"Expected parameter, got end of string '%ls'", str.c_str());
+                        LOGERROR("Expected parameter, got end of string '%s'", utf8_from_wstring(str));
                         break;
                     }
                     if (str[p] != L'"')
                     {
-                        LOGERROR(L"Unquoted parameters are not supported (at pos %d '%ls')", 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(L"Escape character at end of string '%ls'", 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(L"Invalid tag '%ls' at %d in '%ls'", 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(L"Closing tag '%ls' does not match last opened tag '%ls' at %d in '%ls'", 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(L"Escape character at end of string '%ls'", str.c_str());
+                LOGERROR("Escape character at end of string '%s'", utf8_from_wstring(str));
                 break;
             }
             if (str[p] == L'n')

source/gui/GUIutil.cpp

@@ -69 +69 @@
     {
         if (stream.eof())
         {
-            LOGWARNING(L"Too few CRect parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+            LOGWARNING("Too few CRect parameters (min %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
             return false;
         }
         stream >> coords[i];
         if ((stream.rdstate() & std::wstringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CRect parameters. Your input: '%hs'", Value.ToUTF8().c_str());
+            LOGWARNING("Unable to parse CRect parameters. Your input: '%s'", Value.ToUTF8().c_str());
             return false;
         }
     }
 
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many CRect parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+        LOGWARNING("Too many CRect parameters (max %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
         return false;
     }
 
@@ -134 +134 @@
     {
         if (stream.eof())
         {
-            LOGWARNING(L"Too few CSize parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+            LOGWARNING("Too few CSize parameters (min %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
             return false;
         }
         stream >> coords[i];
         if ((stream.rdstate() & std::wstringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CSize parameters. Your input: '%hs'", Value.ToUTF8().c_str());
+            LOGWARNING("Unable to parse CSize parameters. Your input: '%s'", Value.ToUTF8().c_str());
             return false;
         }
     }
@@ -150 +150 @@
 
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many CSize parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+        LOGWARNING("Too many CSize parameters (max %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
         return false;
     }
 
@@ -169 +169 @@
     {
         if (stream.eof())
         {
-            LOGWARNING(L"Too few CPos parameters (min %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+            LOGWARNING("Too few CPos parameters (min %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
             return false;
         }
         stream >> coords[i];
         if ((stream.rdstate() & std::wstringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CPos parameters. Your input: '%hs'", Value.ToUTF8().c_str());
+            LOGWARNING("Unable to parse CPos parameters. Your input: '%s'", Value.ToUTF8().c_str());
             return false;
         }
     }
@@ -185 +185 @@
 
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many CPos parameters (max %i). Your input: '%hs'", NUM_COORDS, Value.ToUTF8().c_str());
+        LOGWARNING("Too many CPos parameters (max %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
         return false;
     }
 
@@ -339 +339 @@
     std::map<CStr, SGUISetting>::const_iterator it = pObject->m_Settings.find(Setting);
     if (it == pObject->m_Settings.end())
     {
-        LOGWARNING(L"setting %hs was not found on object %hs", 
+        LOGWARNING("setting %s was not found on object %s", 
             Setting.c_str(),
             pObject->GetPresentableName().c_str());
         return PSRETURN_GUI_InvalidSetting;
@@ -388 +388 @@
 
     if (!pObject->SettingExists(Setting))
     {
-        LOGWARNING(L"setting %hs was not found on object %hs", 
+        LOGWARNING("setting %s was not found on object %s", 
             Setting.c_str(),
             pObject->GetPresentableName().c_str());
         return PSRETURN_GUI_InvalidSetting;

source/gui/IGUIObject.cpp

@@ -561 +561 @@
 
 PSRETURN IGUIObject::LogInvalidSettings(const CStr8 &Setting) const
 {
-    LOGWARNING(L"IGUIObject: setting %hs was not found on an object", 
+    LOGWARNING("IGUIObject: setting %s was not found on an object", 
         Setting.c_str());
     return PSRETURN_GUI_InvalidSetting;
 }

source/gui/scripting/ScriptFunctions.cpp

@@ -308 +308 @@
     
     shared_ptr<ScriptInterface::StructuredClone> GUIMetadataClone = pCxPrivate->pScriptInterface->WriteStructuredClone(GUIMetadata);
     if (SavedGames::Save(filename, description, *g_Game->GetSimulation2(), GUIMetadataClone, g_Game->GetPlayerID()) < 0)
-        LOGERROR(L"Failed to save game");
+        LOGERROR("Failed to save game");
 }
 
 void SaveGamePrefix(ScriptInterface::CxPrivate* pCxPrivate, std::wstring prefix, std::wstring description, CScriptVal GUIMetadata1)
@@ -320 +320 @@
     
     shared_ptr<ScriptInterface::StructuredClone> GUIMetadataClone = pCxPrivate->pScriptInterface->WriteStructuredClone(GUIMetadata);
     if (SavedGames::SavePrefix(prefix, description, *g_Game->GetSimulation2(), GUIMetadataClone, g_Game->GetPlayerID()) < 0)
-        LOGERROR(L"Failed to save game");
+        LOGERROR("Failed to save game");
 }
 
 void SetNetworkGameAttributes(ScriptInterface::CxPrivate* pCxPrivate, CScriptVal attribs1)
@@ -630 +630 @@
     if (g_NetServer)
         g_NetServer->SetTurnLength(length);
     else
-        LOGERROR(L"Only network host can change turn length");
+        LOGERROR("Only network host can change turn length");
 }
 
 // Focus the game camera on a given position.
@@ -676 +676 @@
     g_Game->GetWorld()->GetTerrain()->GetHeightMipmap().DumpToDisk(filename);
     OsPath realPath;
     g_VFS->GetRealPath(filename, realPath);
-    LOGMESSAGERENDER(L"Terrain mipmap written to '%ls'", realPath.string().c_str());
+    LOGMESSAGERENDER("Terrain mipmap written to '%s'", realPath.string8());
 }
 
 void EnableTimeWarpRecording(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), unsigned int numTurns)
@@ -906 +906 @@
     ONCE(InitJsTimers(*(pCxPrivate->pScriptInterface)));
     
     if (slot >= MAX_JS_TIMERS)
-        LOGERROR(L"Exceeded the maximum number of timer slots for scripts!");
+        LOGERROR("Exceeded the maximum number of timer slots for scripts!");
 
     js_start_times[slot].SetFromTimer();
 }
@@ -914 +914 @@
 void StopJsTimer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), unsigned int slot)
 {
     if (slot >= MAX_JS_TIMERS)
-        LOGERROR(L"Exceeded the maximum number of timer slots for scripts!");
+        LOGERROR("Exceeded the maximum number of timer slots for scripts!");
 
     TimerUnit now;
     now.SetFromTimer();

source/i18n/L10n.cpp

@@ -203 +203 @@
             return;
         }
         else
-            LOGWARNING(L"The configured locale is not valid or no translations are available. Falling back to another locale.");
+            LOGWARNING("The configured locale is not valid or no translations are available. Falling back to another locale.");
     }
     
     Locale systemLocale = Locale::getDefault();
@@ -408 +408 @@
     UnicodeString unicodeFormat = UnicodeString::fromUTF8(formatString.c_str());
     SimpleDateFormat* dateFormat = new SimpleDateFormat(unicodeFormat, status);
     if (U_FAILURE(status))
-        LOGERROR(L"Error creating SimpleDateFormat: %hs", u_errorName(status));
+        LOGERROR("Error creating SimpleDateFormat: %s", u_errorName(status));
 
     const TimeZone* timeZone = TimeZone::getGMT();
 
     status = U_ZERO_ERROR;
     Calendar* calendar = Calendar::createInstance(*timeZone, currentLocale, status);
     if (U_FAILURE(status))
-        LOGERROR(L"Error creating calendar: %hs", u_errorName(status));
+        LOGERROR("Error creating calendar: %s", u_errorName(status));
    
     dateFormat->adoptCalendar(calendar);
     dateFormat->format(milliseconds, dateString);
@@ -470 +470 @@
     if (path.string().rfind(dictName) == std::string::npos)
         return INFO::OK;
 
-    LOGMESSAGE(L"Hotloading translations from '%ls'", path.string().c_str());
+    LOGMESSAGE("Hotloading translations from '%s'", path.string8());
 
     CVFSFile file;
     if (file.Load(g_VFS, path) != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to read translations from '%ls'", path.string().c_str());
+        LOGERROR("Failed to read translations from '%s'", path.string8());
         return ERR::FAIL;
     }
 
@@ -505 +505 @@
         std::wstring dictName = GetFallbackToAvailableDictLocale(currentLocale);
         if (vfs::GetPathnames(g_VFS, L"l10n/", dictName.append(L".*.po").c_str(), filenames) < 0)
         {
-            LOGERROR(L"No files for the dictionary found, but at this point the input should already be validated!");
+            LOGERROR("No files for the dictionary found, but at this point the input should already be validated!");
             return;
         }
     }
@@ -569 +569 @@
     }
     catch(std::exception& e)
     {
-        LOGERROR(L"[Localization] Exception while reading virtual PO file: %hs", e.what());
+        LOGERROR("[Localization] Exception while reading virtual PO file: %s", e.what());
     }
 }
 

source/lib/path.h

@@ -41 +41 @@
 # include "boost/functional/hash.hpp"
 #endif
 
+#include "lib/utf8.h"
+
 #include <cstring>
 
 namespace ERR
@@ -125 +127 @@
         return path;
     }
 
+    std::string string8() const
+    {
+        return utf8_from_wstring(path);
+    }
+
     bool operator<(const Path& rhs) const
     {
         return path < rhs.path;

source/lib/secure_crt.cpp

@@ -237 +237 @@
     }
 
     const int ret = tvsnprintf(dst, max_dst_chars, fmt, ap);
-    if(ret >= int(max_dst_chars))   // not enough space
+    if(ret < 0 || ret >= int(max_dst_chars))    // not enough space
     {
         dst[0] = '\0';
         return -1;

source/lib/self_test.h

@@ -269 +269 @@
 #define TS_ASSERT_PATH_EQUALS(path1, path2) TS_ASSERT_EQUALS((path1).string(), (path2).string())
 #define TSM_ASSERT_PATH_EQUALS(m, path1, path2) TSM_ASSERT_EQUALS(m, (path1).string(), (path2).string())
 
+bool ts_str_contains(const std::string& str1, const std::string& str2); // defined in test_setup.cpp
 bool ts_str_contains(const std::wstring& str1, const std::wstring& str2); // defined in test_setup.cpp
+#define TS_ASSERT_STR_CONTAINS(str1, str2) TSM_ASSERT(str1, ts_str_contains(str1, str2))
+#define TS_ASSERT_STR_NOT_CONTAINS(str1, str2) TSM_ASSERT(str1, !ts_str_contains(str1, str2))
 #define TS_ASSERT_WSTR_CONTAINS(str1, str2) TSM_ASSERT(str1, ts_str_contains(str1, str2))
 #define TS_ASSERT_WSTR_NOT_CONTAINS(str1, str2) TSM_ASSERT(str1, !ts_str_contains(str1, str2))
 

source/lib/sysdep/os/linux/dir_watch_inotify.cpp

@@ -188 +188 @@
             // Check for error ?
             int err = errno;
             initialized = -1;
-            LOGERROR(L"Error initializing inotify file descriptor; hotloading will be disabled, errno=%d", err);
+            LOGERROR("Error initializing inotify file descriptor; hotloading will be disabled, errno=%d", err);
             errno = err;
             return StatusFromErrno();   // NOWARN
         }
@@ -198 +198 @@
         if (ret != 0)
         {
             initialized = -1;
-            LOGERROR(L"Error creating inotify event loop thread; hotloading will be disabled, err=%d", ret);
+            LOGERROR("Error creating inotify event loop thread; hotloading will be disabled, err=%d", ret);
             errno = ret;
             return StatusFromErrno();   // NOWARN
         }

deleted file source/lib/sysdep/os/unix/printf.cpp

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "precompiled.h"
-
-#include <cstdio>
-#include <cstdarg>
-
-// See declaration in sysdep.h for explanation of need
-
-int sys_vswprintf(wchar_t* buffer, size_t count, const wchar_t* format, va_list argptr)
-{
-    int ret = vswprintf(buffer, count, format, argptr);
-
-    // Guarantee the buffer is null terminated on error
-    if (ret < 0 && count > 0)
-        buffer[count-1] = '\0';
-
-    return ret;
-}

deleted file source/lib/sysdep/os/win/wprintf.cpp

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * implementation of sys_vswprintf.
- */
-
-#include "precompiled.h"
-
-#if ARCH_IA32
-
-/*
-    See http://www.opengroup.org/onlinepubs/009695399/functions/fprintf.html
-    for the specification (apparently an extension to ISO C) that was used
-    when creating this code.
-*/
-
-/*
-    Added features (compared to MSVC's printf):
-        Positional parameters (e.g. "%1$d", where '1' means '1st in the parameter list')
-        %lld (equivalent to %I64d in MSVC7.1, though it's supported natively by MSVC8)
-
-    Unsupported features (compared to a perfect implementation):
-        '   <-- because MSVC doesn't support it
-        %S  }
-        %C  } because they're unnecessary and can cause confusion
-        *   <-- probably works in some situations, but don't expect it to
-        *m$ <-- positional precision parameters, because they're not worthwhile
-        portability <-- just use GCC
-        efficiency  <-- nothing in the spec says it should be as fast as possible
-                        (the code could be made a lot faster if speed mattered more
-                        than non-fixed size buffers)
-
-*/
-
-#ifndef _UNICODE
-#define _UNICODE
-#endif
-#include <tchar.h>
-#ifdef _UNICODE
-# define tstring wstring
-# define tstringstream wstringstream
-#else
-# define tstring string
-# define tstringstream stringstream
-#endif
-#include <string>
-#include <vector>
-
-#include <stdio.h>
-#include <sstream>
-#include <stdarg.h>
-
-#if MSC_VERSION < 1400
-# define USE_I64_FORMAT 1
-#else
-# define USE_I64_FORMAT 0
-#endif
-
-enum
-{
-    SPECFLAG_THOUSANDS      = 1,    // '
-    SPECFLAG_LEFTJUSTIFIED  = 2,    // -
-    SPECFLAG_SIGNED         = 4,    // +
-    SPECFLAG_SPACEPREFIX    = 8,    // <space>
-    SPECFLAG_ALTERNATE      = 16,   // #
-    SPECFLAG_ZEROPAD        = 32    // 0
-};
-
-struct FormatChunk
-{
-    virtual ~FormatChunk() { }
-    virtual int ChunkType() = 0; // 0 = FormatSpecification, 1 = FormatString
-};
-
-struct FormatVariable : public FormatChunk
-{
-    int ChunkType() { return 0; }
-    int position;   // undefined if the format includes no positional elements
-    char flags;     // ['-+ #0]
-    int width;      // -1 for *, 0 for unspecified  
-    int precision;  // -1 for *
-    int length;     // "\0\0\0l", "\0\0hh", etc
-    char type;      // 'd', etc
-};
-
-struct FormatString : public FormatChunk
-{
-    int ChunkType() { return 1; }
-    FormatString(std::tstring t) : text(t) {}
-    std::tstring text;
-};
-
-
-int get_flag(TCHAR c)
-{
-    switch (c)
-    {
-    case _T('\''): return SPECFLAG_THOUSANDS;
-    case _T('-'):  return SPECFLAG_LEFTJUSTIFIED;
-    case _T('+'):  return SPECFLAG_SIGNED;
-    case _T(' '):  return SPECFLAG_SPACEPREFIX;
-    case _T('#'):  return SPECFLAG_ALTERNATE;
-    case _T('0'):  return SPECFLAG_ZEROPAD;
-    }
-    return 0;
-}
-
-std::tstring flags_to_string(char flags)
-{
-    std::tstring s;
-    const char* c = "\'-+ #0";
-    for (int i=0; i<6; ++i)
-        if (flags & (1<<i))
-            s += c[i];
-    return s;
-}
-
-template<typename T>
-std::tstring to_string(T n)
-{
-    std::tstring s;
-    std::tstringstream str;
-    str << n;
-    str >> s;
-    return s;
-}
-
-int is_lengthmod(TCHAR c)
-{
-    return 
-        c == _T('h') ||
-        c == _T('l') ||
-        c == _T('j') ||
-        c == _T('z') ||
-        c == _T('t') ||
-        c == _T('L');
-}
-
-// _T2('l') == 'll'
-#define _T2(a) ((a<<8) | a)
-
-int type_size(TCHAR type, int length)
-{
-    switch (type)
-    {
-    case 'd':
-    case 'i': 
-        switch (length)
-        {
-        case _T ('l'):  return sizeof(long);
-        case _T2('l'):  return sizeof(long long);
-        case _T ('h'):  return sizeof(short);
-        case _T2('h'):  return sizeof(char);
-        default: return sizeof(int);
-        }
-    case 'o':
-    case 'u':
-    case 'x':
-    case 'X': return sizeof(unsigned);
-    case 'f':
-    case 'F':
-    case 'e':
-    case 'E':
-    case 'g':
-    case 'G':
-    case 'a':
-    case 'A':
-        if (length == _T('L'))
-            return sizeof(long double);
-        else
-            return sizeof(double);
-        
-    case 'c': 
-        // "%lc" is a wide character, passed as a wint_t (ushort)
-        if (length == _T('l'))
-            return sizeof(wint_t);
-        // "%c" is an int, apparently
-        else
-            return sizeof(int);
-
-    case 's':
-        if (length == _T('l'))
-            return sizeof(wchar_t*);
-        else
-            return sizeof(char*);
-
-    case 'p':
-        return sizeof(void*);
-
-    case 'n':
-        return sizeof(int*);
-
-    }
-    return 0;
-}
-
-int sys_vswprintf(TCHAR* buffer, size_t count, const TCHAR* format, va_list argptr)
-{
-    // To help quickly detect incorrect 'count' values, fill the buffer with 0s
-    memset(buffer, 0, count*sizeof(TCHAR));
-
-    /*
-    
-    Format 'variable' specifications are (in pseudo-Perl regexp syntax):
-
-    % (\d+$)? ['-+ #0]? (* | \d+)?  (. (* | \d*) )? (hh|h|l|ll|j|z|t|L)? [diouxXfFeEgGaAcspnCS%]
-      position  flags     width       precision          length                   type
-
-    */
-
-    /**** Parse the format string into constant/variable chunks ****/
-
-    std::vector<FormatChunk*> specs;
-    std::tstring stringchunk;
-
-    TCHAR chr;
-
-#define readchar(x) if ((x = *format++) == '\0') { delete s; goto finished_reading; }
-
-    while ((chr = *format++) != '\0')
-    {
-        if (chr == _T('%'))
-        {
-            // Handle %% correctly
-            if (*format == _T('%'))
-            {
-                stringchunk += _T('%');
-                continue;
-            }
-
-            // End the current string and start a new spec chunk
-            if (stringchunk.length())
-            {
-                specs.push_back(new FormatString(stringchunk));
-                stringchunk = _T("");
-            }
-
-            FormatVariable *s = new FormatVariable;
-            s->position = -1;
-            s->flags = 0;
-            s->width = 0;
-            s->precision = 0;
-            s->length = 0;
-            s->type = 0;
-
-            // Read either the position or the width
-            int number = 0;
-
-            while (1)
-            {
-                readchar(chr);
-
-                // Read flags (but not if it's a 0 appearing after other digits)
-                if (!number && get_flag(chr))
-                    s->flags = (char)(s->flags|get_flag(chr));
-
-                // Read decimal numbers (position or width)
-                else if (isdigit(chr))
-                    number = number*10 + (chr-'0');
-
-                // If we've reached a $, 'number' was the position,
-                // so remember it and start getting the width
-                else if (chr == _T('$'))
-                {
-                    s->position = number;
-                    number = 0;
-                }
-
-                // End of the number section
-                else
-                {
-                    // Remember the width
-                    s->width = number;
-
-                    // Start looking for a precision
-                    if (chr == _T('.'))
-                    {
-                        // Found a precision: read the digits
-
-                        number = 0;
-
-                        while (1)
-                        {
-                            readchar(chr);
-
-                            if (isdigit(chr))
-                                number = number*10 + (chr-'0');
-                            else
-                            {
-                                s->precision = number;
-                                break;
-                            }
-                        }
-                    }
-
-                    // Finished dealing with any precision.
-
-                    // Now check for length and type codes.
-
-                    if (chr == _T('I'))
-                    {
-                        DEBUG_WARN_ERR(ERR::LOGIC); // MSVC-style \"%I64\" is not allowed!
-                    }
-
-                    if (is_lengthmod(chr))
-                    {
-                        s->length = chr;
-
-                        // Check for ll and hh
-                        if (chr == _T('l') || chr == _T('h'))
-                        {
-                            if (*format == chr)
-                            {
-                                s->length |= (chr << 8);
-                                ++format;
-                            }
-                        }
-
-                        readchar(chr);
-                    }
-
-                    s->type = (char)chr;
-
-                    specs.push_back(s);
-
-                    break;
-                }
-            }
-        }
-        else
-        {
-            stringchunk += chr;
-        }
-    }
-
-#undef readchar
-
-finished_reading:
-
-    if (stringchunk.length())
-    {
-        specs.push_back(new FormatString(stringchunk));
-        stringchunk = _T("");
-    }
-
-    /**** Build a new format string (to pass to the system printf) ****/
-
-    std::tstring newformat;
-
-    std::vector<int> varsizes; // stores the size of each variable type, to allow stack twiddling
-
-    typedef std::vector<FormatChunk*>::iterator ChunkIt;
-
-    for (ChunkIt it = specs.begin(); it != specs.end(); ++it)
-    {
-        if ((*it)->ChunkType() == 0)
-        {
-            FormatVariable* s = static_cast<FormatVariable*>(*it);
-
-            if (s->position > 0)
-            {
-                // Grow if necessary
-                if (s->position >= (int)varsizes.size())
-                    varsizes.resize(s->position+1, -1);
-                // Store the size of the current type
-                varsizes[s->position] = type_size(s->type, s->length);
-            }
-
-
-            newformat += _T("%");
-
-            if (s->flags)
-                newformat += flags_to_string(s->flags);
-            
-            if (s->width == -1)
-                newformat += '*';
-            else if (s->width)
-                newformat += to_string(s->width);
-
-            if (s->precision)
-            {
-                newformat += '.';
-                if (s->precision == -1)
-                    newformat += '*';
-                else
-                    newformat += to_string(s->precision);
-            }
-
-            if (s->length)
-            {
-                if (s->length > 256)
-                {
-                    if (s->length == 0x00006c6c)
-                        #if USE_I64_FORMAT
-                         newformat += "I64";
-                        #else
-                         newformat += _T("ll");
-                        #endif
-                    else if (s->length == 0x00006868)
-                        newformat += _T("hh");
-                }
-                else
-                {
-                    newformat += (char) s->length;
-                }
-            }
-
-            newformat += s->type;
-        }
-        else
-        {
-            FormatString* s = static_cast<FormatString*>(*it);
-            newformat += s->text;
-        }
-    }
-
-
-/*
-    varargs on x86:
-
-    All types are padded to 4 bytes, so size-in-stack == _INTSIZEOF(type).
-    No special alignment is required.
-
-    first+_INTSIZEOF(first) == first item in stack
-
-    Keep adding _INTSIZEOF(item) to get the next item
-*/
-
-// Because of those dangerous assumptions about varargs:
-#if !ARCH_IA32
-#error SLIGHTLY FATAL ERROR: Only x86 is supported!
-#endif
-
-    // Highly efficient buffer to store the rearranged copy of the stack
-    std::string newstack;
-
-    std::vector< std::pair<char*, char*> > stackitems;
-
-    va_list arglist = argptr;
-    //va_start(arglist, format);
-
-    const u8* newstackptr;
-
-    if (varsizes.size())
-    {
-
-        for (size_t i = 1; i < varsizes.size(); ++i)
-        {
-            if (varsizes[i] <= 0)
-            {
-                DEBUG_WARN_ERR(ERR::LOGIC); // Invalid variable type somewhere - make sure all variable things are positional and defined
-                return -1;
-            }
-
-            // Based on _INTSIZEOF in stdarg.h:
-            // (Warning - slightly non-portable. But we use gcc's default printf
-            // when portability matters.)
-            #define INTSIZE(n)   ( (n + sizeof(int) - 1) & ~(sizeof(int) - 1) )
-
-            size_t size = INTSIZE(varsizes[i]);
-            stackitems.push_back( std::pair<char*, char*>( arglist, arglist+size ));
-            arglist += size;
-        }
-
-
-        for (ChunkIt it = specs.begin(); it != specs.end(); ++it)
-        {
-            FormatChunk* chunk = *it;
-            if (chunk->ChunkType() == 0)
-            {
-                FormatVariable* s = static_cast<FormatVariable*>(chunk);
-                if (s->position <= 0)
-                {
-                    DEBUG_WARN_ERR(ERR::LOGIC); // Invalid use of positional elements - make sure all variable things are positional and defined
-                    return -1;
-                }
-                newstack += std::string( stackitems[s->position-1].first, stackitems[s->position-1].second );
-            }
-        }
-        
-        newstackptr = (const u8*)newstack.c_str();
-    }
-    else
-    {
-        newstackptr = (const u8*)arglist;
-    }
-
-    for (ChunkIt it = specs.begin(); it != specs.end(); ++it)
-        if ((*it)->ChunkType() == 0)
-            delete static_cast<FormatVariable*>(*it);
-        else
-            delete static_cast<FormatString*>(*it);
-
-    int ret = _vsntprintf(buffer, count, newformat.c_str(), (va_list)newstackptr);
-
-    // For consistency with GCC's vsnprintf, make sure the buffer is null-terminated
-    // and return an error if that truncates the output
-    if(count > 0)
-        buffer[count-1] = '\0';
-    if (ret == (int)count)
-        return -1;
-
-    return ret;
-}
-
-#endif

source/lib/sysdep/sysdep.h

@@ -30 +30 @@
 #include "lib/debug.h"  // ErrorReactionInternal
 #include "lib/os_path.h"
 
-#include <cstdarg>  // needed for sys_vswprintf
-
 
 //
 // output
@@ -81 +79 @@
 LIB_API std::wstring sys_WideFromArgv(const char* argv_i);
 
 /**
- * sys_vswprintf: doesn't quite follow the standard for vswprintf, but works
- * better across compilers:
- * - handles positional parameters and %lld
- * - always null-terminates the buffer, if count > 0
- * - returns -1 on overflow (if the output string (including null) does not fit in the buffer)
- **/
-extern int sys_vswprintf(wchar_t* buffer, size_t count, const wchar_t* format, va_list argptr);
-
-/**
  * describe the current OS error state.
  * 
  * @param err: if not 0, use that as the error code to translate; otherwise,

deleted file source/lib/sysdep/tests/test_printf.h

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "lib/self_test.h"
-
-#include "lib/sysdep/sysdep.h"
-
-class TestPrintf : public CxxTest::TestSuite 
-{
-    // Split some bits into separate functions, so we can get
-    // a legitimate va_list to pass to sys_vswprintf:
-
-    void _test_truncate(int buffer_size, const wchar_t* expected_output, int expected_return, /* wchar_t* input_string */...)
-    {
-        wchar_t buf[17] = L"................"; // fill with dots so null-termination is made obvious
-
-        va_list ap;
-        va_start(ap, expected_return);
-
-        int ret = sys_vswprintf(buf, buffer_size, L"%ls", ap);
-
-        TS_ASSERT_WSTR_EQUALS(buf, expected_output);
-        TS_ASSERT_EQUALS(ret, expected_return);
-
-        std::wstring past_buffer(buf + buffer_size);
-        TS_ASSERT(past_buffer.find_first_not_of('.') == past_buffer.npos);
-
-        va_end(ap);
-    }
-
-    void _test_sprintf(const wchar_t* expected_output, const wchar_t* format, ...)
-    {
-        wchar_t buf[256];
-
-        va_list ap;
-        va_start(ap, format);
-
-        sys_vswprintf(buf, ARRAY_SIZE(buf), format, ap);
-        TS_ASSERT_WSTR_EQUALS(buf, expected_output);
-
-        va_end(ap);
-    }
-
-public:
-    void test_truncate()
-    {
-        _test_truncate(0, L"................", -1, L"1234");
-        _test_truncate(1, L"",                 -1, L"1234");
-
-        _test_truncate(8, L"1234",     4, L"1234");
-        _test_truncate(8, L"1234567",  7, L"1234567");
-        _test_truncate(8, L"1234567", -1, L"12345678");
-        _test_truncate(8, L"1234567", -1, L"123456789");
-        _test_truncate(8, L"1234567", -1, L"123456789abcdef");
-    }
-
-    void test_lld()
-    {
-        i64 z = 0;
-        i64 n = 65536;
-        _test_sprintf(L"0", L"%lld", z);
-        _test_sprintf(L"65536", L"%lld", n);
-        _test_sprintf(L"4294967296", L"%lld", n*n);
-        _test_sprintf(L"281474976710656", L"%lld", n*n*n);
-        _test_sprintf(L"-281474976710656", L"%lld", -n*n*n);
-        _test_sprintf(L"123 456 281474976710656 789", L"%d %d %lld %d", 123, 456, n*n*n, 789);
-    }
-
-    void test_pos()
-    {
-        _test_sprintf(L"a b", L"%1$c %2$c", 'a', 'b');
-        _test_sprintf(L"b a", L"%2$c %1$c", 'a', 'b');
-    }
-
-    void test_pos_lld()
-    {
-        _test_sprintf(L"1 2 3", L"%1$d %2$lld %3$d", 1, (i64)2, 3);
-        _test_sprintf(L"2 1 3", L"%2$lld %1$d %3$d", 1, (i64)2, 3);
-    }
-};

source/lib/tests/test_secure_crt.h

@@ -81 +81 @@
     const char* const s1;
     const char* const s5;
     const char* const s10;
+    const wchar_t* const ws10;
 
     char d1[1];
     char d2[2];
@@ -88 +89 @@
     char d5[5];
     char d6[6];
     char d10[10];
+    wchar_t wd10[10];
     char d11[11];
 
     char no_null[7];
@@ -157 +159 @@
 
 public:
     TestString_s()
-        : s0(""), s1("a"), s5("abcde"), s10("abcdefghij")
+        : s0(""), s1("a"), s5("abcde"), s10("abcdefghij"), ws10(L"abcdefghij")
     {
         const char no_null_tmp[] = { 'n','o','_','n','u','l','l'};
         memcpy(no_null, no_null_tmp, sizeof(no_null));
@@ -303 +305 @@
         if (dst) TS_ASSERT_STR_EQUALS(dst, expected_dst);
     }
 
+    static void TEST_WPRINTF(wchar_t* dst, size_t max_dst_chars, const wchar_t* dst_val,
+        int expected_ret, const wchar_t* expected_dst, const wchar_t* fmt, ...)
+    {
+        if (dst) wcscpy(dst, dst_val);
+        va_list ap;
+        va_start(ap, fmt);
+        int ret = vswprintf_s(dst, max_dst_chars, fmt, ap);
+        va_end(ap);
+        TS_ASSERT_EQUALS(ret, expected_ret);
+        if (dst) TS_ASSERT_WSTR_EQUALS(dst, expected_dst);
+    }
+
     void test_printf()
     {
         TEST_PRINTF(d10,10, s10, 4, "1234", "%d", 1234);
@@ -315 +329 @@
         TEST_PRINTF(NULL,0, NULL, -1, "", "%d", 1234);
         TEST_PRINTF(d10,10, s10, -1, "abcdefghij", NULL);
     }
+
+    void test_wprintf()
+    {
+        TEST_WPRINTF(wd10,10, ws10, 4, L"1234", L"%d", 1234);
+        TEST_WPRINTF(wd10,5, ws10, 4, L"1234", L"%d", 1234);
+
+        SuppressErrors suppress;
+        TEST_WPRINTF(wd10,4, ws10, -1, L"", L"%d", 1234);
+        TEST_WPRINTF(wd10,3, ws10, -1, L"", L"%d", 1234);
+        TEST_WPRINTF(wd10,0, ws10, -1, L"abcdefghij", L"%d", 1234);
+        TEST_WPRINTF(NULL,0, NULL, -1, L"", L"%d", 1234);
+        TEST_WPRINTF(wd10,10, ws10, -1, L"abcdefghij", NULL);
+    }
 };

source/lobby/XmppClient.cpp

@@ -749 +749 @@
     {
         CreateSimpleMessage("system", g_L10n.Translate("unknown subtype (see logs)"), "error");
         std::string tag = tag_name(iq);
-        LOGMESSAGE(L"unknown subtype '%hs'", tag.c_str());
+        LOGMESSAGE("unknown subtype '%s'", tag.c_str());
     }
 
     return true;
@@ -896 +896 @@
     else IF("offline", Unavailable);
     // The others are not to be set
 #undef IF
-    else LOGERROR(L"Unknown presence '%hs'", presence.c_str());
+    else LOGERROR("Unknown presence '%s'", presence.c_str());
 }
 
 /**
@@ -952 +952 @@
     CASE(Error, "error");
     CASE(Invalid, "invalid");
     default:
-        LOGERROR(L"Unknown presence type '%d'", (int)p);
+        LOGERROR("Unknown presence type '%d'", (int)p);
         break;
 #undef CASE
     }
@@ -975 +975 @@
     CASE(RoleModerator, "moderator");
     CASE(RoleInvalid, "invalid");
     default:
-        LOGERROR(L"Unknown role type '%d'", (int)r);
+        LOGERROR("Unknown role type '%d'", (int)r);
         break;
 #undef CASE
     }

source/main.cpp

@@ -159 +159 @@
             // Fullscreen toggling is broken on OS X w/ SDL 1.2, see http://trac.wildfiregames.com/ticket/741
             g_VideoMode.ToggleFullscreen();
 #else
-            LOGWARNING(L"Toggling fullscreen and resizing are disabled on OS X due to a known bug. Please use the config file to change display settings.");
+            LOGWARNING("Toggling fullscreen and resizing are disabled on OS X due to a known bug. Please use the config file to change display settings.");
 #endif
             return IN_HANDLED;
         }

source/network/NetClient.cpp

@@ -304 +304 @@
 
         std::stringstream stream;
 
-        LOGMESSAGERENDER(L"Serializing game at turn %u for rejoining player", m_ClientTurnManager->GetCurrentTurn());
+        LOGMESSAGERENDER("Serializing game at turn %u for rejoining player", m_ClientTurnManager->GetCurrentTurn());
         u32 turn = to_le32(m_ClientTurnManager->GetCurrentTurn());
         stream.write((char*)&turn, sizeof(turn));
 
@@ -324 +324 @@
     // Update FSM
     bool ok = Update(message->GetType(), message);
     if (!ok)
-        LOGERROR(L"Net client: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)GetCurrState());
+        LOGERROR("Net client: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)GetCurrState());
     return ok;
 }
 
@@ -347 +347 @@
         stream.read((char*)&turn, sizeof(turn));
         turn = to_le32(turn);
 
-        LOGMESSAGE(L"Rejoining client deserializing state at turn %u\n", turn);
+        LOGMESSAGE("Rejoining client deserializing state at turn %u\n", turn);
 
         bool ok = m_Game->GetSimulation2()->DeserializeState(stream);
         ENSURE(ok);
@@ -428 +428 @@
 
     CAuthenticateResultMessage* message = (CAuthenticateResultMessage*)event->GetParamRef();
 
-    LOGMESSAGE(L"Net: Authentication result: host=%u, %ls", 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/NetFileTransfer.cpp

@@ -15 +15 @@
 
         if (m_FileReceiveTasks.find(respMessage->m_RequestID) == m_FileReceiveTasks.end())
         {
-            LOGERROR(L"Net transfer: Unsolicited file transfer response (id=%d)", (int)respMessage->m_RequestID);
+            LOGERROR("Net transfer: Unsolicited file transfer response (id=%d)", (int)respMessage->m_RequestID);
             return ERR::FAIL;
         }
 
         if (respMessage->m_Length == 0 || respMessage->m_Length > MAX_FILE_TRANSFER_SIZE)
         {
-            LOGERROR(L"Net transfer: Invalid size for file transfer response (length=%d)", (int)respMessage->m_Length);
+            LOGERROR("Net transfer: Invalid size for file transfer response (length=%d)", (int)respMessage->m_Length);
             return ERR::FAIL;
         }
 
@@ -30 +30 @@
         task->m_Length = respMessage->m_Length;
         task->m_Buffer.reserve(respMessage->m_Length);
 
-        LOGMESSAGERENDER(L"Downloading data over network (%d KB) - please wait...", (int)(task->m_Length/1024));
+        LOGMESSAGERENDER("Downloading data over network (%d KB) - please wait...", (int)(task->m_Length/1024));
         m_LastProgressReportTime = timer_Time();
 
         return INFO::OK;
@@ -41 +41 @@
 
         if (m_FileReceiveTasks.find(dataMessage->m_RequestID) == m_FileReceiveTasks.end())
         {
-            LOGERROR(L"Net transfer: Unsolicited file transfer data (id=%d)", (int)dataMessage->m_RequestID);
+            LOGERROR("Net transfer: Unsolicited file transfer data (id=%d)", (int)dataMessage->m_RequestID);
             return ERR::FAIL;
         }
 
@@ -51 +51 @@
 
         if (task->m_Buffer.size() > task->m_Length)
         {
-            LOGERROR(L"Net transfer: Invalid size for file transfer data (length=%d actual=%d)", (int)task->m_Length, (int)task->m_Buffer.size());
+            LOGERROR("Net transfer: Invalid size for file transfer data (length=%d actual=%d)", (int)task->m_Length, (int)task->m_Buffer.size());
             return ERR::FAIL;
         }
 
@@ -62 +62 @@
 
         if (task->m_Buffer.size() == task->m_Length)
         {
-            LOGMESSAGERENDER(L"Download completed");
+            LOGMESSAGERENDER("Download completed");
 
             task->OnComplete();
             m_FileReceiveTasks.erase(dataMessage->m_RequestID);
@@ -75 +75 @@
         double t = timer_Time();
         if (t > m_LastProgressReportTime + 0.5)
         {
-            LOGMESSAGERENDER(L"Downloading data: %.1f%% of %d KB", 100.f*task->m_Buffer.size()/task->m_Length, (int)(task->m_Length/1024));
+            LOGMESSAGERENDER("Downloading data: %.1f%% of %d KB", 100.f*task->m_Buffer.size()/task->m_Length, (int)(task->m_Length/1024));
             m_LastProgressReportTime = t;
         }
 
@@ -87 +87 @@
 
         if (m_FileSendTasks.find(ackMessage->m_RequestID) == m_FileSendTasks.end())
         {
-            LOGERROR(L"Net transfer: Unsolicited file transfer ack (id=%d)", (int)ackMessage->m_RequestID);
+            LOGERROR("Net transfer: Unsolicited file transfer ack (id=%d)", (int)ackMessage->m_RequestID);
             return ERR::FAIL;
         }
 
@@ -95 +95 @@
 
         if (ackMessage->m_NumPackets > task.packetsInFlight)
         {
-            LOGERROR(L"Net transfer: Invalid num packets for file transfer ack (num=%d inflight=%d)",
+            LOGERROR("Net transfer: Invalid num packets for file transfer ack (num=%d inflight=%d)",
                 (int)ackMessage->m_NumPackets, (int)task.packetsInFlight);
             return ERR::FAIL;
         }

source/network/NetHost.cpp

@@ -29 +29 @@
     if (!packet)
         return false;
 
-    LOGMESSAGE(L"Net: Sending message %hs of size %lu to %hs", message->ToString().c_str(), (unsigned long)packet->dataLength, peerName);
+    LOGMESSAGE("Net: Sending message %s of size %lu to %s", message->ToString().c_str(), (unsigned long)packet->dataLength, peerName);
 
     // Let ENet send the message to peer
     if (enet_peer_send(peer, DEFAULT_CHANNEL, packet) < 0)
     {
-        LOGERROR(L"Net: Failed to send packet to peer");
+        LOGERROR("Net: Failed to send packet to peer");
         return false;
     }
 
@@ -62 +62 @@
     // Create a reliable packet
     ENetPacket* packet = enet_packet_create(&buffer[0], size, ENET_PACKET_FLAG_RELIABLE);
     if (!packet)
-        LOGERROR(L"Net: Failed to construct packet");
+        LOGERROR("Net: Failed to construct packet");
 
     return packet;
 }

source/network/NetMessage.cpp

@@ -54 +54 @@
 {
     if (pStart + 3 > pEnd)
     {
-        LOGERROR(L"CNetMessage: Corrupt packet (smaller than header)");
+        LOGERROR("CNetMessage: Corrupt packet (smaller than header)");
         return NULL;
     }
 
@@ -68 +68 @@
 
     if (pStart + size != pEnd)
     {
-        LOGERROR(L"CNetMessage: Corrupt packet (incorrect size)");
+        LOGERROR("CNetMessage: Corrupt packet (incorrect size)");
         return NULL;
     }
 
@@ -184 +184 @@
         break;
 
     default:
-        LOGERROR(L"CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
+        LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
         break;
     }
 

source/network/NetServer.cpp

@@ -94 +94 @@
 
         if (!session)
         {
-            LOGMESSAGE(L"Net server: rejoining client disconnected before we sent to it");
+            LOGMESSAGE("Net server: rejoining client disconnected before we sent to it");
             return;
         }
 
@@ -177 +177 @@
     m_Host = enet_host_create(&addr, MAX_CLIENTS, CHANNEL_COUNT, 0, 0);
     if (!m_Host)
     {
-        LOGERROR(L"Net server: enet_host_create failed");
+        LOGERROR("Net server: enet_host_create failed");
         return false;
     }
 
@@ -224 +224 @@
     std::string rootDescURL;
     CFG_GET_VAL("network.upnprootdescurl", rootDescURL);
     if (!rootDescURL.empty())
-        LOGMESSAGE(L"Net server: attempting to use cached root descriptor URL: %hs", rootDescURL.c_str());
+        LOGMESSAGE("Net server: attempting to use cached root descriptor URL: %s", rootDescURL.c_str());
 
     int ret = 0;
     bool allocatedUrls = false;
@@ -232 +232 @@
     // Try a cached URL first
     if (!rootDescURL.empty() && UPNP_GetIGDFromUrl(rootDescURL.c_str(), &urls, &data, internalIPAddress, sizeof(internalIPAddress)))
     {
-        LOGMESSAGE(L"Net server: using cached IGD = %hs", urls.controlURL);
+        LOGMESSAGE("Net server: using cached IGD = %s", urls.controlURL);
         ret = 1;
     }
     // No cached URL, or it did not respond. Try getting a valid UPnP device for 10 seconds.
@@ -243 +243 @@
     }
     else
     {
-        LOGMESSAGE(L"Net server: upnpDiscover failed and no working cached URL.");
+        LOGMESSAGE("Net server: upnpDiscover failed and no working cached URL.");
         return NULL;
     }
 
     switch (ret)
     {
     case 0:
-        LOGMESSAGE(L"Net server: No IGD found");
+        LOGMESSAGE("Net server: No IGD found");
         break;
     case 1:
-        LOGMESSAGE(L"Net server: found valid IGD = %hs", urls.controlURL);
+        LOGMESSAGE("Net server: found valid IGD = %s", urls.controlURL);
         break;
     case 2:
-        LOGMESSAGE(L"Net server: found a valid, not connected IGD = %hs, will try to continue anyway", urls.controlURL);
+        LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL);
         break;
     case 3:
-        LOGMESSAGE(L"Net server: found a UPnP device unrecognized as IGD = %hs, will try to continue anyway", urls.controlURL);
+        LOGMESSAGE("Net server: found a UPnP device unrecognized as IGD = %s, will try to continue anyway", urls.controlURL);
         break;
     default:
         debug_warn(L"Unrecognized return value from UPNP_GetValidIGD");
@@ -269 +269 @@
     ret = UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress);
     if (ret != UPNPCOMMAND_SUCCESS)
     {
-        LOGMESSAGE(L"Net server: GetExternalIPAddress failed with code %d (%hs)", ret, strupnperror(ret));
+        LOGMESSAGE("Net server: GetExternalIPAddress failed with code %d (%s)", ret, strupnperror(ret));
         return NULL;
     }
-    LOGMESSAGE(L"Net server: ExternalIPAddress = %hs", externalIPAddress);
+    LOGMESSAGE("Net server: ExternalIPAddress = %s", externalIPAddress);
 
     // Try to setup port forwarding.
     ret = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, psPort, psPort,
                             internalIPAddress, description, protocall, 0, leaseDuration);
     if (ret != UPNPCOMMAND_SUCCESS)
     {
-        LOGMESSAGE(L"Net server: AddPortMapping(%hs, %hs, %hs) failed with code %d (%hs)",
+        LOGMESSAGE("Net server: AddPortMapping(%s, %s, %s) failed with code %d (%s)",
                psPort, psPort, internalIPAddress, ret, strupnperror(ret));
         return NULL;
     }
@@ -296 +296 @@
 
     if (ret != UPNPCOMMAND_SUCCESS)
     {
-        LOGMESSAGE(L"Net server: GetSpecificPortMappingEntry() failed with code %d (%hs)", ret, strupnperror(ret));
+        LOGMESSAGE("Net server: GetSpecificPortMappingEntry() failed with code %d (%s)", ret, strupnperror(ret));
         return NULL;
     }
 
-    LOGMESSAGE(L"Net server: External %hs:%hs %hs is redirected to internal %hs:%hs (duration=%hs)",
+    LOGMESSAGE("Net server: External %s:%s %s is redirected to internal %s:%s (duration=%s)",
                    externalIPAddress, psPort, protocall, intClient, intPort, duration);
 
     // Cache root descriptor URL to try to avoid discovery next time.
     g_ConfigDB.SetValueString(CFG_USER, "network.upnprootdescurl", urls.controlURL);
     g_ConfigDB.WriteFile(CFG_USER);
-    LOGMESSAGE(L"Net server: cached UPnP root descriptor URL as %hs", urls.controlURL);
+    LOGMESSAGE("Net server: cached UPnP root descriptor URL as %s", urls.controlURL);
 
     // Make sure everything is properly freed.
     if (allocatedUrls)
@@ -451 +451 @@
     int status = enet_host_service(m_Host, &event, HOST_SERVICE_TIMEOUT);
     if (status < 0)
     {
-        LOGERROR(L"CNetServerWorker: enet_host_service failed (%d)", status);
+        LOGERROR("CNetServerWorker: enet_host_service failed (%d)", status);
         // TODO: notify game that the server has shut down
         return false;
     }
@@ -471 +471 @@
         // Report the client address
         char hostname[256] = "(error)";
         enet_address_get_host_ip(&event.peer->address, hostname, ARRAY_SIZE(hostname));
-        LOGMESSAGE(L"Net server: Received connection from %hs:%u", hostname, (unsigned int)event.peer->address.port);
+        LOGMESSAGE("Net server: Received connection from %s:%u", hostname, (unsigned int)event.peer->address.port);
 
         // Set up a session object for this peer
 
@@ -496 +496 @@
         CNetServerSession* session = static_cast<CNetServerSession*>(event.peer->data);
         if (session)
         {
-            LOGMESSAGE(L"Net server: Disconnected %hs", DebugName(session).c_str());
+            LOGMESSAGE("Net server: Disconnected %s", DebugName(session).c_str());
 
             // Remove the session first, so we won't send player-update messages to it
             // when updating the FSM
@@ -522 +522 @@
             CNetMessage* msg = CNetMessageFactory::CreateMessage(event.packet->data, event.packet->dataLength, GetScriptInterface());
             if (msg)
             {
-                LOGMESSAGE(L"Net server: Received message %hs of size %lu from %hs", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength(), DebugName(session).c_str());
+                LOGMESSAGE("Net server: Received message %s of size %lu from %s", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength(), DebugName(session).c_str());
 
                 HandleMessageReceive(msg, session);
 
@@ -566 +566 @@
     // Update FSM
     bool ok = session->Update(message->GetType(), (void*)message);
     if (!ok)
-        LOGERROR(L"Net server: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)session->GetCurrState());
+        LOGERROR("Net server: Error running FSM update (type=%d state=%d)", (int)message->GetType(), (int)session->GetCurrState());
 }
 
 void CNetServerWorker::SetupSession(CNetServerSession* session)
@@ -810 +810 @@
         // Players who weren't already in the game are not allowed to join now that it's started
         if (!isRejoining)
         {
-            LOGMESSAGE(L"Refused connection after game start from not-previously-known user \"%ls\"", 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/NetSession.cpp

@@ -112 +112 @@
             // Report the server address
             char hostname[256] = "(error)";
             enet_address_get_host_ip(&event.peer->address, hostname, ARRAY_SIZE(hostname));
-            LOGMESSAGE(L"Net client: Connected to %hs:%u", hostname, (unsigned int)event.peer->address.port);
+            LOGMESSAGE("Net client: Connected to %s:%u", hostname, (unsigned int)event.peer->address.port);
 
             m_Client.HandleConnect();
 
@@ -123 +123 @@
         {
             ENSURE(event.peer == m_Server);
 
-            LOGMESSAGE(L"Net client: Disconnected");
+            LOGMESSAGE("Net client: Disconnected");
             m_Client.HandleDisconnect(event.data);
             return;
         }
@@ -133 +133 @@
             CNetMessage* msg = CNetMessageFactory::CreateMessage(event.packet->data, event.packet->dataLength, m_Client.GetScriptInterface());
             if (msg)
             {
-                LOGMESSAGE(L"Net client: Received message %hs of size %lu from server", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength());
+                LOGMESSAGE("Net client: Received message %s of size %lu from server", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength());
 
                 m_Client.HandleMessage(msg);
 

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(L"%ls", msg.str().c_str());
+        LOGERROR("%s", msg.str());
 }
 
 void CNetTurnManager::Interpolate(float simFrameLength, float realFrameLength)
@@ -327 +336 @@
     bool ok = m_Simulation2.SerializeState(stream);
     if (!ok)
     {
-        LOGERROR(L"Failed to quicksave game");
+        LOGERROR("Failed to quicksave game");
         return;
     }
 
@@ -337 +346 @@
     else
         m_QuickSaveMetadata = std::string();
 
-    LOGMESSAGERENDER(L"Quicksaved game");
+    LOGMESSAGERENDER("Quicksaved game");
 
 }
 
@@ -347 +356 @@
 
     if (m_QuickSaveState.empty())
     {
-        LOGERROR(L"Cannot quickload game - no game was quicksaved");
+        LOGERROR("Cannot quickload game - no game was quicksaved");
         return;
     }
 
@@ -355 +364 @@
     bool ok = m_Simulation2.DeserializeState(stream);
     if (!ok)
     {
-        LOGERROR(L"Failed to quickload game");
+        LOGERROR("Failed to quickload game");
         return;
     }
 
     if (g_GUI && !m_QuickSaveMetadata.empty())
         g_GUI->RestoreSavedGameData(m_QuickSaveMetadata);
 
-    LOGMESSAGERENDER(L"Quickloaded game");
+    LOGMESSAGERENDER("Quickloaded game");
 
     // See RewindTimeWarp
     ResetState(0, 1);

source/ps/CLogger.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25 +25 @@
 #include "lib/ogl.h"
 #include "lib/timer.h"
 #include "lib/utf8.h"
-#include "lib/sysdep/sysdep.h"
 #include "ps/Profile.h"
 #include "renderer/Renderer.h"
 
@@ -140 +139 @@
     }
 }
 
-static std::string ToHTML(const wchar_t* message)
+static std::string ToHTML(const char* message)
 {
-    Status err;
-    std::string cmessage = utf8_from_wstring(message, &err);
+    std::string cmessage = message;
     boost::algorithm::replace_all(cmessage, "&", "&");
     boost::algorithm::replace_all(cmessage, "<", "&lt;");
     return cmessage;
 }
 
-void CLogger::WriteMessage(const wchar_t* message, bool doRender = false)
+void CLogger::WriteMessage(const char* message, bool doRender = false)
 {
     std::string cmessage = ToHTML(message);
 
@@ -157 +155 @@
 
     ++m_NumberOfMessages;
 //  if (m_UseDebugPrintf)
-//      debug_printf(L"MESSAGE: %ls\n", message);
+//      debug_printf(L"MESSAGE: %hs\n", message);
 
     *m_MainLog << "<p>" << cmessage << "</p>\n";
     m_MainLog->flush();
     
     if (doRender)
     {
-        if (g_Console) g_Console->InsertMessage(L"INFO: %ls", message);
+        if (g_Console) g_Console->InsertMessage(L"INFO: %hs", message);
 
         PushRenderMessage(Normal, message);
     }
 }
 
-void CLogger::WriteError(const wchar_t* message)
+void CLogger::WriteError(const char* message)
 {
     std::string cmessage = ToHTML(message);
 
@@ -178 +176 @@
 
     ++m_NumberOfErrors;
     if (m_UseDebugPrintf)
-        debug_printf(L"ERROR: %ls\n", message);
+        debug_printf(L"ERROR: %hs\n", message);
 
-    if (g_Console) g_Console->InsertMessage(L"ERROR: %ls", message);
+    if (g_Console) g_Console->InsertMessage(L"ERROR: %hs", message);
     *m_InterestingLog << "<p class=\"error\">ERROR: " << cmessage << "</p>\n";
     m_InterestingLog->flush();
 
@@ -190 +188 @@
     PushRenderMessage(Error, message);
 }
 
-void CLogger::WriteWarning(const wchar_t* message)
+void CLogger::WriteWarning(const char* message)
 {
     std::string cmessage = ToHTML(message);
 
@@ -198 +196 @@
 
     ++m_NumberOfWarnings;
     if (m_UseDebugPrintf)
-        debug_printf(L"WARNING: %ls\n", message);
+        debug_printf(L"WARNING: %hs\n", message);
 
-    if (g_Console) g_Console->InsertMessage(L"WARNING: %ls", message);
+    if (g_Console) g_Console->InsertMessage(L"WARNING: %hs", message);
     *m_InterestingLog << "<p class=\"warning\">WARNING: " << cmessage << "</p>\n";
     m_InterestingLog->flush();
 
@@ -210 +208 @@
     PushRenderMessage(Warning, message);
 }
 
-void CLogger::LogMessage(const wchar_t* fmt, ...)
-{
-    va_list argp;
-    wchar_t buffer[BUFFER_SIZE] = {0};
-    
-    va_start(argp, fmt);
-    if (sys_vswprintf(buffer, ARRAY_SIZE(buffer), fmt, argp) == -1)
-    {
-        // Buffer too small - ensure the string is nicely terminated
-        wcscpy_s(buffer+ARRAY_SIZE(buffer)-4, 4, L"...");
-    }
-    va_end(argp);
-
-    WriteMessage(buffer);
-}
-
-void CLogger::LogMessageRender(const wchar_t* fmt, ...)
-{
-    va_list argp;
-    wchar_t buffer[BUFFER_SIZE] = {0};
-    
-    va_start(argp, fmt);
-    if (sys_vswprintf(buffer, ARRAY_SIZE(buffer), fmt, argp) == -1)
-    {
-        // Buffer too small - ensure the string is nicely terminated
-        wcscpy_s(buffer+ARRAY_SIZE(buffer)-4, 4, L"...");
-    }
-    va_end(argp);
-
-    WriteMessage(buffer, true);
-}
-
-void CLogger::LogWarning(const wchar_t* fmt, ...)
-{
-    va_list argp;
-    wchar_t buffer[BUFFER_SIZE] = {0};
-    
-    va_start(argp, fmt);
-    if (sys_vswprintf(buffer, ARRAY_SIZE(buffer), fmt, argp) == -1)
-    {
-        // Buffer too small - ensure the string is nicely terminated
-        wcscpy_s(buffer+ARRAY_SIZE(buffer)-4, 4, L"...");
-    }
-    va_end(argp);
-
-    WriteWarning(buffer);
-}
-
-void CLogger::LogError(const wchar_t* fmt, ...)
-{
-    va_list argp;
-    wchar_t buffer[BUFFER_SIZE] = {0};
-    
-    va_start(argp, fmt);
-    if (sys_vswprintf(buffer, ARRAY_SIZE(buffer), fmt, argp) == -1)
-    {
-        // Buffer too small - ensure the string is nicely terminated
-        wcscpy_s(buffer+ARRAY_SIZE(buffer)-4, 4, L"...");
-    }
-    va_end(argp);
-
-    WriteError(buffer);
-}
-
 void CLogger::Render()
 {
     PROFILE3_GPU("logger");
@@ -300 +234 @@
 
     for (std::deque<RenderedMessage>::iterator it = m_RenderMessages.begin(); it != m_RenderMessages.end(); ++it)
     {
-        const wchar_t* type;
+        const char* type;
         if (it->method == Normal)
         {
-            type = L"info";
+            type = "info";
             textRenderer.Color(0.0f, 0.8f, 0.0f);
         }
         else if (it->method == Warning)
         {
-            type = L"warning";
+            type = "warning";
             textRenderer.Color(1.0f, 1.0f, 0.0f);
         }
         else
         {
-            type = L"error";
+            type = "error";
             textRenderer.Color(1.0f, 0.0f, 0.0f);
         }
 
         CMatrix3D savedTransform = textRenderer.GetTransform();
 
-        textRenderer.PrintfAdvance(L"[%8.3f] %ls: ", it->time, type);
+        textRenderer.PrintfAdvance(L"[%8.3f] %hs: ", it->time, type);
         // Display the actual message in white so it's more readable
         textRenderer.Color(1.0f, 1.0f, 1.0f);
         textRenderer.Put(0.0f, 0.0f, it->message.c_str());
@@ -334 +268 @@
     textTech->EndPass();
 }
 
-void CLogger::PushRenderMessage(ELogMethod method, const wchar_t* message)
+void CLogger::PushRenderMessage(ELogMethod method, const char* message)
 {
     double now = timer_Time();
 
     // Add each message line separately
-    const wchar_t* pos = message;
-    const wchar_t* eol;
-    while ((eol = wcschr(pos, L'\n')) != NULL)
+    const char* pos = message;
+    const char* eol;
+    while ((eol = strchr(pos, '\n')) != NULL)
     {
         if (eol != pos)
         {
-            RenderedMessage r = { method, now, std::wstring(pos, eol) };
+            RenderedMessage r = { method, now, std::string(pos, eol) };
             m_RenderMessages.push_back(r);
         }
         pos = eol + 1;
     }
     // Add the last line, if we didn't end on a \n
-    if (*pos != L'\0')
+    if (*pos != '\0')
     {
-        RenderedMessage r = { method, now, std::wstring(pos) };
+        RenderedMessage r = { method, now, std::string(pos) };
         m_RenderMessages.push_back(r);
     }
 }
@@ -398 +332 @@
     g_Logger = m_OldLogger;
 }
 
-std::wstring TestLogger::GetOutput()
+std::string TestLogger::GetOutput()
 {
-    Status err;
-    return wstring_from_utf8(m_Stream.str(), &err);
+    return m_Stream.str();
 }
 
 TestStdoutLogger::TestStdoutLogger()

source/ps/CLogger.h

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24 +24 @@
 #include <sstream>
 
 #include "ps/ThreadUtil.h"
+#include "third_party/cppformat/format.h"
 
 class CLogger;
 extern CLogger* g_Logger;
 
 
-#define LOGMESSAGE g_Logger->LogMessage
-#define LOGMESSAGERENDER g_Logger->LogMessageRender
-#define LOGWARNING g_Logger->LogWarning
-#define LOGERROR g_Logger->LogError
+#define LOGMESSAGE(...)       g_Logger->WriteMessage(fmt::sprintf(__VA_ARGS__).c_str(), false)
+#define LOGMESSAGERENDER(...) g_Logger->WriteMessage(fmt::sprintf(__VA_ARGS__).c_str(), true)
+#define LOGWARNING(...)       g_Logger->WriteWarning(fmt::sprintf(__VA_ARGS__).c_str())
+#define LOGERROR(...)         g_Logger->WriteError  (fmt::sprintf(__VA_ARGS__).c_str())
 
 /**
  * Error/warning/message logging class.
@@ -64 +65 @@
 
     // Functions to write different message types (Errors and warnings are placed 
     // both in mainLog and intrestingLog.)
-    void WriteMessage(const wchar_t* message, bool doRender);
-    void WriteError  (const wchar_t* message);
-    void WriteWarning(const wchar_t* message);
+    void WriteMessage(const char* message, bool doRender);
+    void WriteError  (const char* message);
+    void WriteWarning(const char* message);
     
-    // Functions to write a message, warning or error to file.
-    void LogMessage(const wchar_t* fmt, ...) WPRINTF_ARGS(2);
-    void LogMessageRender(const wchar_t* fmt, ...) WPRINTF_ARGS(2);
-    void LogWarning(const wchar_t* fmt, ...) WPRINTF_ARGS(2);
-    void LogError(const wchar_t* fmt, ...) WPRINTF_ARGS(2);
-
     // Render recent log messages onto the screen
     void Render();
     
 private:
     void Init();
 
-    void PushRenderMessage(ELogMethod method, const wchar_t* message);
+    void PushRenderMessage(ELogMethod method, const char* message);
 
     // Delete old timed-out entries from the list of text to render
     void CleanupRenderQueue();
@@ -104 +99 @@
     {
         ELogMethod method;
         double time;
-        std::wstring message;
+        std::string message;
     };
     std::deque<RenderedMessage> m_RenderMessages;
     double m_RenderLastEraseTime;
@@ -123 +118 @@
 public:
     TestLogger();
     ~TestLogger();
-    std::wstring GetOutput();
+    std::string GetOutput();
 private:
     CLogger* m_OldLogger;
     std::stringstream m_Stream;

source/ps/CStrIntern.cpp

@@ -30 +30 @@
     CStrInternInternals(const char* str, size_t len)
         : data(str, str+len), hash(fnv_hash(str, len))
     {
-//      LOGWARNING(L"New interned string '%hs'", data.c_str());
+//      LOGWARNING("New interned string '%s'", data.c_str());
     }
 
     bool operator==(const CStrInternInternals& b) const

source/ps/ConfigDB.cpp

@@ -214 +214 @@
         // Handle missing files quietly
         if (g_VFS->GetFileInfo(m_ConfigFile[ns], NULL) < 0)
         {
-            LOGMESSAGE(L"Cannot find config file \"%ls\" - ignoring", m_ConfigFile[ns].string().c_str());
+            LOGMESSAGE("Cannot find config file \"%s\" - ignoring", m_ConfigFile[ns].string8());
             return false;
         }
 
-        LOGMESSAGE(L"Loading config file \"%ls\"", m_ConfigFile[ns].string().c_str());
+        LOGMESSAGE("Loading config file \"%s\"", m_ConfigFile[ns].string8());
         Status ret = g_VFS->LoadFile(m_ConfigFile[ns], buffer, buflen);
         if (ret != INFO::OK)
         {
-            LOGERROR(L"CConfigDB::Reload(): vfs_load for \"%ls\" failed: return was %lld", m_ConfigFile[ns].string().c_str(), (long long)ret);
+            LOGERROR("CConfigDB::Reload(): vfs_load for \"%s\" failed: return was %lld", m_ConfigFile[ns].string8(), (long long)ret);
             return false;
         }
     }
@@ -256 +256 @@
 
             if (pos == filebufend || *pos == '\n')
             {
-                LOGERROR(L"Config header with missing close tag encountered on line %d in '%ls'", line, m_ConfigFile[ns].string().c_str());
+                LOGERROR("Config header with missing close tag encountered on line %d in '%s'", line, m_ConfigFile[ns].string8());
                 header.clear();
                 ++line;
                 continue;
             }
 
-            LOGMESSAGE(L"Found config header '%hs'", header.c_str());
+            LOGMESSAGE("Found config header '%s'", header.c_str());
             header.push_back('.');
             while (++pos < filebufend && *pos != '\n' && *pos != ';')
                 if (*pos != ' ' && *pos != '\r')
                 {
-                    LOGERROR(L"Config settings on the same line as a header on line %d in '%ls'", line, m_ConfigFile[ns].string().c_str());
+                    LOGERROR("Config settings on the same line as a header on line %d in '%s'", line, m_ConfigFile[ns].string8());
                     break;
                 }
             while (pos < filebufend && *pos != '\n')
@@ -288 +288 @@
                     {
                         if (*pos == '\\' && ++pos == filebufend)
                         {
-                            LOGERROR(L"Escape character at end of input (line %d in '%ls')", line, m_ConfigFile[ns].string().c_str());
+                            LOGERROR("Escape character at end of input (line %d in '%s')", line, m_ConfigFile[ns].string8());
                             break;
                         }
 
@@ -316 +316 @@
                 }
             }
             if (quoted) // We ignore the invalid parameter
-                LOGERROR(L"Unmatched quote while parsing config file '%ls' on line %d", m_ConfigFile[ns].string().c_str(), line);
+                LOGERROR("Unmatched quote while parsing config file '%s' on line %d", m_ConfigFile[ns].string8(), line);
             else if (!value.empty())
                 values.push_back(value);
             value.clear();
@@ -337 +337 @@
             CStr key(header + name);
             newMap[key] = values;
             if (key == "lobby.password")
-                LOGMESSAGE(L"Loaded config string \"%hs\"", 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(L"Loaded config string \"%hs\" = %hs", key.c_str(), vals.c_str());
+                LOGMESSAGE("Loaded config string \"%s\" = %s", key, vals);
             }
         }
         else if (!name.empty())
-            LOGERROR(L"Encountered config setting '%hs' without value while parsing '%ls' on line %d", name.c_str(), m_ConfigFile[ns].string().c_str(), 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(L"Config file does not have a new line after the last config setting '%hs'", name.c_str());
+        LOGERROR("Config file does not have a new line after the last config setting '%s'", name);
 
     m_Map[ns].swap(newMap);
 
@@ -393 +393 @@
     Status ret = g_VFS->CreateFile(path, buf, len);
     if (ret < 0)
     {
-        LOGERROR(L"CConfigDB::WriteFile(): CreateFile \"%ls\" failed (error: %d)", path.string().c_str(), (int)ret);
+        LOGERROR("CConfigDB::WriteFile(): CreateFile \"%s\" failed (error: %d)", path.string8(), (int)ret);
         return false;
     }
 

source/ps/DllLoader.cpp

@@ -196 +196 @@
     switch (m_LoadErrorLogMethod)
     {
     case CLogger::Normal:
-        LOGMESSAGE(L"DllLoader: %hs", errors);
+        LOGMESSAGE("DllLoader: %s", errors);
         break;
     case CLogger::Warning:
-        LOGWARNING(L"DllLoader: %hs", errors);
+        LOGWARNING("DllLoader: %s", errors);
         break;
     case CLogger::Error:
-        LOGERROR(L"DllLoader: %hs", errors);
+        LOGERROR("DllLoader: %s", errors);
         break;
     }
 }

source/ps/FileIo.cpp

@@ -69 +69 @@
     const Status st = g_VFS->CreateFile(filename, m_writeBuffer.Data(), m_writeBuffer.Size());
     if (st < 0)
     {
-        LOGERROR(L"Failed to write file '%ls' with status '%lld'", filename.string().c_str(), (long long)st);
+        LOGERROR("Failed to write file '%s' with status '%lld'", filename.string8(), (long long)st);
         throw PSERROR_File_WriteFailed();
     }
 }

source/ps/Filesystem.cpp

@@ -124 +124 @@
     if (ret != INFO::OK)
     {
         if (log)
-            LOGERROR(L"CVFSFile: file %ls couldn't be opened (vfs_load: %lld)", filename.string().c_str(), (long long)ret);
+            LOGERROR("CVFSFile: file %s couldn't be opened (vfs_load: %lld)", filename.string8(), (long long)ret);
         m_Buffer.reset();
         m_BufferSize = 0;
         return PSRETURN_CVFSFile_LoadFailed;

source/ps/GameSetup/Config.cpp

@@ -131 +131 @@
     CFG_GET_VAL("profiler2.script.enable", g_ScriptProfilingEnabled);
 
     if (g_JSDebuggerEnabled)
-        LOGERROR(L"JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)");
+        LOGERROR("JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)");
     // Script Debugging and profiling does not make sense together because of the hooks
     // that reduce performance a lot - and it wasn't tested if it even works together.
     if (g_JSDebuggerEnabled && g_ScriptProfilingEnabled)
-        LOGERROR(L"Enabling both script profiling and script debugging is not supported!");
+        LOGERROR("Enabling both script profiling and script debugging is not supported!");
 }
 
 

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(L"Failed to draw cursor '%ls'", cursorName.c_str());
+                LOGWARNING("Failed to draw cursor '%s'", utf8_from_wstring(cursorName));
 #endif
 
 #if CONFIG2_GLES
@@ -656 +656 @@
 
     if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0)
     {
-        LOGERROR(L"SDL library initialization failed: %hs", SDL_GetError());
+        LOGERROR("SDL library initialization failed: %s", SDL_GetError());
         throw PSERROR_System_SDLInitFailed();
     }
     atexit(SDL_Quit);
@@ -814 +814 @@
     }
     catch (std::runtime_error&)
     {
-        LOGWARNING(L"Invalid locale settings");
+        LOGWARNING("Invalid locale settings");
 
         for (size_t i = 0; i < ARRAY_SIZE(LocaleEnvVars); i++)
         {
             if (char* envval = getenv(LocaleEnvVars[i]))
-                LOGWARNING(L"  %hs=\"%hs\"", LocaleEnvVars[i], envval);
+                LOGWARNING("  %s=\"%s\"", LocaleEnvVars[i], envval);
             else
-                LOGWARNING(L"  %hs=\"(unset)\"", LocaleEnvVars[i]);
+                LOGWARNING("  %s=\"(unset)\"", LocaleEnvVars[i]);
         }
 
         // We should set LC_ALL since it overrides LANG
         if (setenv("LC_ALL", std::locale::classic().name().c_str(), 1))
             debug_warn(L"Invalid locale settings, and unable to set LC_ALL env variable.");
         else
-            LOGWARNING(L"Setting LC_ALL env variable to: %hs", getenv("LC_ALL"));
+            LOGWARNING("Setting LC_ALL env variable to: %s", getenv("LC_ALL"));
     }
 }
 #else
@@ -1132 +1132 @@
 
     if (INFO::OK != loadResult)
     {
-        LOGERROR(L"LoadSettingsOfScenarioMap: Unable to load map file '%ls'", mapPath.string().c_str());
+        LOGERROR("LoadSettingsOfScenarioMap: Unable to load map file '%s'", mapPath.string8());
         throw PSERROR_Game_World_MapLoadFailed("Unable to load map file, check the path for typos.");
     }
     XMBElement mapElement = mapFile.GetRoot();
@@ -1246 +1246 @@
         else
         {
             // Problem with JSON file
-            LOGERROR(L"Autostart: Error reading random map script '%ls'", 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(L"Autostart: Unrecognized map type '%ls'", 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);
@@ -1336 +1336 @@
                 if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
                 {
                     // playerID is certainly bigger than this map player number
-                    LOGWARNING(L"Autostart: Invalid player %d in autostart-ai option", playerID);
+                    LOGWARNING("Autostart: Invalid player %d in autostart-ai option", playerID);
                     continue;
                 }
                 scriptInterface.Eval("({})", &player);
@@ -1363 +1363 @@
                 if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
                 {
                     // playerID is certainly bigger than this map player number
-                    LOGWARNING(L"Autostart: Invalid player %d in autostart-aidiff option", playerID);
+                    LOGWARNING("Autostart: Invalid player %d in autostart-aidiff option", playerID);
                     continue;
                 }
                 scriptInterface.Eval("({})", &player);
@@ -1391 +1391 @@
                     if (mapDirectory == L"skirmishes")
                     {
                         // playerID is certainly bigger than this map player number
-                        LOGWARNING(L"Autostart: Invalid player %d in autostart-civ option", playerID);
+                        LOGWARNING("Autostart: Invalid player %d in autostart-civ option", playerID);
                         continue;
                     }
                     scriptInterface.Eval("({})", &player);
@@ -1403 +1403 @@
             }
         }
         else
-            LOGWARNING(L"Autostart: Option 'autostart-civ' is invalid for scenarios");
+            LOGWARNING("Autostart: Option 'autostart-civ' is invalid for scenarios");
     }
 
     // Add player data to map settings

source/ps/GameSetup/HWDetect.cpp

@@ -203 +203 @@
     CVFSFile file;
     if (file.Load(g_VFS, scriptName) != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load hardware detection script");
+        LOGERROR("Failed to load hardware detection script");
         return;
     }
 

source/ps/GameSetup/Paths.cpp

@@ -172 +172 @@
     // make sure it's valid
     if(!FileExists(pathname))
     {
-        LOGERROR(L"Cannot find executable (expected at '%ls')", pathname.string().c_str());
+        LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());
         WARN_IF_ERR(StatusFromErrno());
     }
 

source/ps/Hotkey.cpp

@@ -83 +83 @@
                 int mapping = FindKeyCode(*it);
                 if (!mapping)
                 {
-                    LOGWARNING(L"Hotkey mapping used invalid key '%hs'", hotkey.c_str());
+                    LOGWARNING("Hotkey mapping used invalid key '%s'", hotkey.c_str());
                     continue;
                 }
 

source/ps/Joystick.cpp

@@ -41 +41 @@
 
     if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
     {
-        LOGERROR(L"CJoystick::Initialise failed to initialise joysticks (\"%hs\")", SDL_GetError());
+        LOGERROR("CJoystick::Initialise failed to initialise joysticks (\"%s\")", SDL_GetError());
         return;
     }
 
     int numJoysticks = SDL_NumJoysticks();
 
-    LOGMESSAGE(L"Found %d joystick(s)", numJoysticks);
+    LOGMESSAGE("Found %d joystick(s)", numJoysticks);
 
     for (int i = 0; i < numJoysticks; ++i)
     {
@@ -55 +55 @@
         SDL_Joystick* stick = SDL_JoystickOpen(i);
         if (!stick)
         {
-            LOGERROR(L"CJoystick::Initialise failed to open joystick %d (\"%hs\")", i, SDL_GetError());
+            LOGERROR("CJoystick::Initialise failed to open joystick %d (\"%s\")", i, SDL_GetError());
             continue;
         }
         const char* name = SDL_JoystickName(stick);
 #else // SDL 1.2
         const char* name = SDL_JoystickName(i);
 #endif
-        LOGMESSAGE(L"Joystick %d: %hs", i, name);
+        LOGMESSAGE("Joystick %d: %s", i, name);
 #if SDL_VERSION_ATLEAST(2, 0, 0)
         SDL_JoystickClose(stick);
 #endif
@@ -75 +75 @@
         // Always pick the first joystick, and assume that's the right one
         m_Joystick = SDL_JoystickOpen(0);
         if (!m_Joystick)
-            LOGERROR(L"CJoystick::Initialise failed to open joystick (\"%hs\")", SDL_GetError());
+            LOGERROR("CJoystick::Initialise failed to open joystick (\"%s\")", SDL_GetError());
     }
 }
 

source/ps/Overlay.cpp

@@ -48 +48 @@
         stream >> values[i];
         if ((stream.rdstate() & std::stringstream::failbit) != 0)
         {
-            LOGWARNING(L"Unable to parse CColor parameters. Your input: '%hs'", Value.c_str());
+            LOGWARNING("Unable to parse CColor parameters. Your input: '%s'", Value.c_str());
             return false;
         }
         if (values[i] < 0 || values[i] > 255)
         {
-            LOGWARNING(L"Invalid value (<0 or >255) when parsing CColor parameters. Your input: '%hs'", Value.c_str());
+            LOGWARNING("Invalid value (<0 or >255) when parsing CColor parameters. Your input: '%s'", Value.c_str());
             return false;
         }
     }
 
     if (i < 3)
     {
-        LOGWARNING(L"Not enough parameters when parsing as CColor. Your input: '%hs'", Value.c_str());
+        LOGWARNING("Not enough parameters when parsing as CColor. Your input: '%s'", Value.c_str());
         return false;
     }
     if (!stream.eof())
     {
-        LOGWARNING(L"Too many parameters when parsing as CColor. Your input: '%hs'", Value.c_str());
+        LOGWARNING("Too many parameters when parsing as CColor. Your input: '%s'", Value.c_str());
         return false;
     }
 

source/ps/Preprocessor.cpp

@@ -231 +231 @@
 {
     (void)iData;
     if (iToken)
-        LOGERROR(L"Preprocessor error: line %d: %hs: '%.*hs'\n",
+        LOGERROR("Preprocessor error: line %d: %s: '%.*hs'\n",
                   iLine, iError, int (iTokenLen), iToken);
     else
-        LOGERROR(L"Preprocessor error: line %d: %hs\n", iLine, iError);
+        LOGERROR("Preprocessor error: line %d: %s\n", iLine, iError);
 }
 
 //---------------------------------------------------------------------------//

source/ps/PreprocessorWrapper.cpp

@@ -51 +51 @@
 
     if (!output)
     {
-        LOGERROR(L"Failed to parse conditional expression '%hs'", expr.c_str());
+        LOGERROR("Failed to parse conditional expression '%s'", expr.c_str());
         return false;
     }
 
@@ -72 +72 @@
 
     if (!output)
     {
-        LOGERROR(L"Shader preprocessing failed");
+        LOGERROR("Shader preprocessing failed");
         return "";
     }
 

source/ps/ProfileViewer.cpp

@@ -570 +570 @@
 
         if (m->outputStream.fail())
         {
-            LOGERROR(L"Failed to open profile log file");
+            LOGERROR("Failed to open profile log file");
             return;
         }
         else
         {
-            LOGMESSAGERENDER(L"Profiler snapshot saved to '%ls'", path.string().c_str());
+            LOGMESSAGERENDER("Profiler snapshot saved to '%s'", path.string8());
         }
     }
 

source/ps/Profiler2.cpp

@@ -126 +126 @@
 
     case MG_EVENT_LOG:
         // Called by Mongoose's cry()
-        LOGERROR(L"Mongoose error: %hs", request_info->log_message);
+        LOGERROR("Mongoose error: %s", request_info->log_message);
         return NULL;
 
     case MG_INIT_SSL:
@@ -157 +157 @@
 void CProfiler2::EnableHTTP()
 {
     ENSURE(m_Initialised);
-    LOGMESSAGERENDER(L"Starting profiler2 HTTP server");
+    LOGMESSAGERENDER("Starting profiler2 HTTP server");
 
     // Ignore multiple enablings
     if (m_MgContext)
@@ -177 +177 @@
     ENSURE(m_Initialised);
     if (!m_GPU)
     {
-        LOGMESSAGERENDER(L"Starting profiler2 GPU mode");
+        LOGMESSAGERENDER("Starting profiler2 GPU mode");
         InitialiseGPU();
     }
 }
 
 void CProfiler2::ShutdownGPU()
 {
-    LOGMESSAGERENDER(L"Shutting down profiler2 GPU mode");
+    LOGMESSAGERENDER("Shutting down profiler2 GPU mode");
     SAFE_DELETE(m_GPU);
 }
 
 void CProfiler2::ShutDownHTTP()
 {
-    LOGMESSAGERENDER(L"Shutting down profiler2 HTTP server");
+    LOGMESSAGERENDER("Shutting down profiler2 HTTP server");
     if (m_MgContext)
     {
         mg_stop(m_MgContext);

source/ps/SavedGame.cpp

@@ -126 +126 @@
 
     OsPath realPath;
     WARN_RETURN_STATUS_IF_ERR(g_VFS->GetRealPath(filename, realPath));
-    LOGMESSAGERENDER(wstring_from_utf8(g_L10n.Translate("Saved game to '%ls'") + "\n").c_str(), realPath.string().c_str());
+    LOGMESSAGERENDER(g_L10n.Translate("Saved game to '%s'"), realPath.string8());
 
     return INFO::OK;
 }
@@ -244 +244 @@
         if (!archiveReader)
         {
             // Triggered by e.g. the file being open in another program
-            LOGWARNING(L"Failed to read saved game '%ls'", realPath.string().c_str());
+            LOGWARNING("Failed to read saved game '%s'", realPath.string8());
             continue; // skip this file
         }
 

source/ps/TemplateLoader.cpp

@@ -39 +39 @@
     // Handle infinite loops more gracefully than running out of stack space and crashing
     if (depth > 100)
     {
-        LOGERROR(L"Probable infinite inheritance loop in entity template '%hs'", templateName.c_str());
+        LOGERROR("Probable infinite inheritance loop in entity template '%s'", templateName.c_str());
         return false;
     }
 
@@ -57 +57 @@
         std::string baseName = templateName.substr(8);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%s'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -72 +72 @@
         std::string baseName = templateName.substr(7);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%s'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -87 +87 @@
         std::string baseName = templateName.substr(7);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%s'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -102 +102 @@
         std::string baseName = templateName.substr(11);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%s'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -117 +117 @@
         std::string baseName = templateName.substr(13);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%s'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -132 +132 @@
         std::string baseName = templateName.substr(9);
         if (!LoadTemplateFile(baseName, depth+1))
         {
-            LOGERROR(L"Failed to load entity template '%hs'", baseName.c_str());
+            LOGERROR("Failed to load entity template '%s'", baseName.c_str());
             return false;
         }
         // Copy a subset to the requested template
@@ -155 +155 @@
         // To prevent needless complexity in template design, we don't allow |-separated strings as parents
         if (parentName.find('|') != parentName.npos)
         {
-            LOGERROR(L"Invalid parent '%hs' in entity template '%hs'", parentName.c_str(), templateName.c_str());
+            LOGERROR("Invalid parent '%s' in entity template '%s'", parentName.c_str(), templateName.c_str());
             return false;
         }
 
         // Ensure the parent is loaded
         if (!LoadTemplateFile(parentName, depth+1))
         {
-            LOGERROR(L"Failed to load parent '%hs' of entity template '%hs'", parentName.c_str(), templateName.c_str());
+            LOGERROR("Failed to load parent '%s' of entity template '%s'", parentName.c_str(), templateName.c_str());
             return false;
         }
 
@@ -272 +272 @@
     }
 
     if (templatesType != SIMULATION_TEMPLATES && templatesType != ACTOR_TEMPLATES && templatesType != ALL_TEMPLATES)
-        LOGERROR(L"Undefined template type (valid: all, simulation, actor)");
+        LOGERROR("Undefined template type (valid: all, simulation, actor)");
 
     return templates;
 }
@@ -304 +304 @@
     }
 
     if (templatesType != SIMULATION_TEMPLATES && templatesType != ACTOR_TEMPLATES && templatesType != ALL_TEMPLATES)
-        LOGERROR(L"Undefined template type (valid: all, simulation, actor)");
+        LOGERROR("Undefined template type (valid: all, simulation, actor)");
 
     return templates;
 }
@@ -314 +314 @@
     // Load the template if necessary
     if (!LoadTemplateFile(templateName, 0))
     {
-        LOGERROR(L"Failed to load entity template '%hs'", templateName.c_str());
+        LOGERROR("Failed to load entity template '%s'", templateName.c_str());
         return NULL_NODE;
     }
 
@@ -327 +327 @@
     const char* templateName = "special/actor";
     if (!LoadTemplateFile(templateName, 0))
     {
-        LOGERROR(L"Failed to load entity template '%hs'", templateName);
+        LOGERROR("Failed to load entity template '%s'", templateName);
         return;
     }
 

source/ps/Util.cpp

@@ -241 +241 @@
     {
         OsPath realPath;
         g_VFS->GetRealPath(filename, realPath);
-        LOGMESSAGERENDER(wstring_from_utf8(g_L10n.Translate("Screenshot written to '%ls'")).c_str(), realPath.string().c_str());
+        LOGMESSAGERENDER(g_L10n.Translate("Screenshot written to '%s'"), realPath.string8());
     }
     else
-        LOGERROR(L"Error writing screenshot to '%ls'", filename.string().c_str());
+        LOGERROR("Error writing screenshot to '%s'", filename.string8());
 }
 
 
@@ -374 +374 @@
     {
         OsPath realPath;
         g_VFS->GetRealPath(filename, realPath);
-        LOGMESSAGERENDER(wstring_from_utf8(g_L10n.Translate("Screenshot written to '%ls'")).c_str(), realPath.string().c_str());
+        LOGMESSAGERENDER(g_L10n.Translate("Screenshot written to '%s'"), realPath.string8());
     }
     else
-        LOGERROR(L"Error writing screenshot to '%ls'", filename.string().c_str());
+        LOGERROR("Error writing screenshot to '%s'", filename.string8());
 
     free(tile_data);
 }

source/ps/VideoMode.cpp

@@ -88 +88 @@
             // If fullscreen fails, try windowed mode
             if (fullscreen)
             {
-                LOGWARNING(L"Failed to set the video mode to fullscreen for the chosen resolution "
-                    L"%dx%d:%d (\"%hs\"), falling back to windowed mode",
+                LOGWARNING("Failed to set the video mode to fullscreen for the chosen resolution "
+                    "%dx%d:%d (\"%hs\"), falling back to windowed mode",
                     w, h, bpp, SDL_GetError());
                 // Using default size for the window for now, as the attempted setting
                 // could be as large, or larger than the screen size.
@@ -97 +97 @@
             }
             else
             {
-                LOGERROR(L"SetVideoMode failed in SDL_CreateWindow: %dx%d:%d %d (\"%hs\")",
+                LOGERROR("SetVideoMode failed in SDL_CreateWindow: %dx%d:%d %d (\"%s\")",
                     w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
                 return false;
             }
@@ -105 +105 @@
 
         if (SDL_SetWindowDisplayMode(m_Window, NULL) < 0)
         {
-            LOGERROR(L"SetVideoMode failed in SDL_SetWindowDisplayMode: %dx%d:%d %d (\"%hs\")",
+            LOGERROR("SetVideoMode failed in SDL_SetWindowDisplayMode: %dx%d:%d %d (\"%s\")",
                 w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
             return false;
         }
@@ -113 +113 @@
         SDL_GLContext context = SDL_GL_CreateContext(m_Window);
         if (!context)
         {
-            LOGERROR(L"SetVideoMode failed in SDL_GL_CreateContext: %dx%d:%d %d (\"%hs\")",
+            LOGERROR("SetVideoMode failed in SDL_GL_CreateContext: %dx%d:%d %d (\"%s\")",
                 w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
             return false;
         }
@@ -132 +132 @@
 
             if (SDL_SetWindowFullscreen(m_Window, flags) < 0)
             {
-                LOGERROR(L"SetVideoMode failed in SDL_SetWindowFullscreen: %dx%d:%d %d (\"%hs\")",
+                LOGERROR("SetVideoMode failed in SDL_SetWindowFullscreen: %dx%d:%d %d (\"%s\")",
                     w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
                 return false;
             }
@@ -172 +172 @@
         // If fullscreen fails, try windowed mode
         if (fullscreen)
         {
-            LOGWARNING(L"Failed to set the video mode to fullscreen for the chosen resolution "
-                L"%dx%d:%d (\"%hs\"), falling back to windowed mode",
+            LOGWARNING("Failed to set the video mode to fullscreen for the chosen resolution "
+                "%dx%d:%d (\"%hs\"), falling back to windowed mode",
                 w, h, bpp, SDL_GetError());
             // Using default size for the window for now, as the attempted setting
             // could be as large, or larger than the screen size.
@@ -181 +181 @@
         }
         else
         {
-            LOGERROR(L"SetVideoMode failed: %dx%d:%d %d (\"%hs\")",
+            LOGERROR("SetVideoMode failed: %dx%d:%d %d (\"%s\")",
                 w, h, bpp, fullscreen ? 1 : 0, SDL_GetError());
             return false;
         }
@@ -294 +294 @@
     u16 ramp[256];
     SDL_CalculateGammaRamp(g_Gamma, ramp);
     if (SDL_SetWindowGammaRamp(m_Window, ramp, ramp, ramp) < 0)
-        LOGWARNING(L"SDL_SetWindowGammaRamp failed");
+        LOGWARNING("SDL_SetWindowGammaRamp failed");
 #else
 # if OS_MACOSX
     // Workaround for crash on Mavericks, see http://trac.wildfiregames.com/ticket/2272
@@ -304 +304 @@
     {
 # endif
     if (SDL_SetGamma(g_Gamma, g_Gamma, g_Gamma) < 0)
-        LOGWARNING(L"SDL_SetGamma failed");
+        LOGWARNING("SDL_SetGamma failed");
 # if OS_MACOSX
     }
 # endif

source/ps/World.cpp

@@ -89 +89 @@
         catch (PSERROR_File& err)
         {
             delete reader;
-            LOGERROR(L"Failed to load map %ls: %hs", mapfilename.string().c_str(), err.what());
+            LOGERROR("Failed to load map %s: %s", mapfilename.string8(), err.what());
             throw PSERROR_Game_World_MapLoadFailed("Failed to load map.\nCheck application log for details.");
         }
     }

source/ps/XML/RelaxNG.cpp

@@ -46 +46 @@
         xmlRelaxNGFreeParserCtxt(ctxt);
 
         if (m_Schema == NULL)
-            LOGERROR(L"RelaxNGValidator: Failed to compile schema");
+            LOGERROR("RelaxNGValidator: Failed to compile schema");
     }
 
     ~RelaxNGSchema()
@@ -108 +108 @@
 
     if (!m_Schema)
     {
-        LOGERROR(L"RelaxNGValidator: No grammar loaded");
+        LOGERROR("RelaxNGValidator: No grammar loaded");
         return false;
     }
 
     xmlDocPtr doc = xmlReadMemory(document.c_str(), (int)document.size(), utf8_from_wstring(filename).c_str(), NULL, XML_PARSE_NONET);
     if (doc == NULL)
     {
-        LOGERROR(L"RelaxNGValidator: Failed to parse document");
+        LOGERROR("RelaxNGValidator: Failed to parse document");
         return false;
     }
 
@@ -130 +130 @@
     }
     else if (ret > 0)
     {
-        LOGERROR(L"RelaxNGValidator: Validation failed");
+        LOGERROR("RelaxNGValidator: Validation failed");
         return false;
     }
     else
     {
-        LOGERROR(L"RelaxNGValidator: Internal error %d", ret);
+        LOGERROR("RelaxNGValidator: Internal error %d", ret);
         return false;
     }
 }

source/ps/XML/XMLWriter.cpp

@@ -102 +102 @@
     Status ret = vfs->CreateFile(pathname, data, size);
     if (ret < 0)
     {
-        LOGERROR(L"Error saving XML data through VFS: %lld '%ls'", (long long)ret, pathname.string().c_str());
+        LOGERROR("Error saving XML data through VFS: %lld '%s'", (long long)ret, pathname.string8());
         return false;
     }
     return true;

source/ps/XML/Xeromyces.cpp

@@ -38 +38 @@
     if (message.length() > 0 && message[message.length()-1] == '\n')
         message.erase(message.length()-1);
 
-    LOGERROR(L"CXeromyces: Parse %ls: %hs:%d: %hs",
-        error->level == XML_ERR_WARNING ? L"warning" : L"error",
-        error->file, error->line, message.c_str());
+    LOGERROR("CXeromyces: Parse %s: %s:%d: %s",
+        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
 }
@@ -89 +89 @@
 
         // No source file or archive cache was found, so we can't load the
         // XML file at all
-        LOGERROR(L"CCacheLoader failed to find archived or source file for: \"%ls\"", filename.string().c_str());
+        LOGERROR("CCacheLoader failed to find archived or source file for: \"%s\"", filename.string8());
         return PSRETURN_Xeromyces_XMLOpenFailed;
     }
 
@@ -111 +111 @@
     CVFSFile input;
     if (input.Load(vfs, filename))
     {
-        LOGERROR(L"CXeromyces: Failed to open XML file %ls", filename.string().c_str());
+        LOGERROR("CXeromyces: Failed to open XML file %s", filename.string8());
         return PSRETURN_Xeromyces_XMLOpenFailed;
     }
 
@@ -120 +120 @@
         filename8.c_str(), NULL, XML_PARSE_NONET|XML_PARSE_NOCDATA);
     if (! doc)
     {
-        LOGERROR(L"CXeromyces: Failed to parse XML file %ls", filename.string().c_str());
+        LOGERROR("CXeromyces: Failed to parse XML file %s", filename.string8());
         return PSRETURN_Xeromyces_XMLParseError;
     }
 
@@ -167 +167 @@
     xmlDocPtr doc = xmlReadMemory(xml, (int)strlen(xml), "", NULL, XML_PARSE_NONET|XML_PARSE_NOCDATA);
     if (! doc)
     {
-        LOGERROR(L"CXeromyces: Failed to parse XML string");
+        LOGERROR("CXeromyces: Failed to parse XML string");
         return PSRETURN_Xeromyces_XMLParseError;
     }
 

source/ps/XML/tests/test_RelaxNG.h

@@ -44 +44 @@
         {
             TestLogger logger;
             TS_ASSERT(!v.Validate(L"doc", L"<bogus/>"));
-            TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"Parse error: doc:1: Expecting element test, got bogus");
+            TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "Parse error: doc:1: Expecting element test, got bogus");
         }
 
         {
             TestLogger logger;
             TS_ASSERT(!v.Validate(L"doc", L"bogus"));
-            TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"RelaxNGValidator: Failed to parse document");
+            TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "RelaxNGValidator: Failed to parse document");
         }
 
         TS_ASSERT(v.Validate(L"doc", L"<test/>"));
@@ -82 +82 @@
 
         TestLogger logger;
         TS_ASSERT(!v.LoadGrammar("whoops"));
-        TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"RelaxNGValidator: Failed to compile schema");
+        TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "RelaxNGValidator: Failed to compile schema");
 
         TS_ASSERT(!v.Validate(L"doc", L"<test/>"));
     }

source/ps/scripting/JSInterface_ConfigDB.cpp

@@ -35 +35 @@
         cfgNs = CFG_MOD;
     else
     {
-        LOGERROR(L"Invalid namespace name passed to the ConfigDB!");
+        LOGERROR("Invalid namespace name passed to the ConfigDB!");
         cfgNs = CFG_DEFAULT;
         return false;       
     }

source/ps/scripting/JSInterface_Console.cpp

@@ -26 +26 @@
 {   
     if (!g_Console)
     {
-        LOGERROR(L"Trying to access the console when it's not initialized!");
+        LOGERROR("Trying to access the console when it's not initialized!");
         return false;
     }
     return true;

source/ps/scripting/JSInterface_VFS.cpp

@@ -36 +36 @@
     }\
     /* unknown failure. We output an error message. */\
     else if (err < 0)\
-        LOGERROR(L"Unknown failure in VFS %i", err );
+        LOGERROR("Unknown failure in VFS %i", err );
     /* else: success */
 
 

source/ps/tests/test_CLogger.h

@@ -24 +24 @@
 public:
     void test_basic()
     {
-        logger->LogMessage(L"Test 1");
-        logger->LogMessage(L"Test 2");
+        logger->WriteMessage("Test 1", false);
+        logger->WriteMessage("Test 2", false);
 
         ParseOutput();
 
@@ -34 +34 @@
         TS_ASSERT_EQUALS(lines[1], "Test 2");
     }
 
-    void test_overflow()
+    void test_unicode()
     {
-        const int buflen = 1024;
-
-        std::string msg0 (buflen-2, '*');
-        std::string msg1 (buflen-1, '*');
-        std::string msg2 (buflen,   '*');
-        std::string msg3 (buflen+1, '*');
-
-        std::string clipped (buflen-4, '*');
-        clipped += "...";
-
-        logger->LogMessage(L"%hs", msg0.c_str());
-        logger->LogMessage(L"%hs", msg1.c_str());
-        logger->LogMessage(L"%hs", msg2.c_str());
-        logger->LogMessage(L"%hs", msg3.c_str());
-
-        logger->LogMessageRender(L"%hs", msg0.c_str());
-        logger->LogMessageRender(L"%hs", msg1.c_str());
-        logger->LogMessageRender(L"%hs", msg2.c_str());
-        logger->LogMessageRender(L"%hs", msg3.c_str());
-
-        logger->LogWarning(L"%hs", msg0.c_str());
-        logger->LogWarning(L"%hs", msg1.c_str());
-        logger->LogWarning(L"%hs", msg2.c_str());
-        logger->LogWarning(L"%hs", msg3.c_str());
-
-        logger->LogError(L"%hs", msg0.c_str());
-        logger->LogError(L"%hs", msg1.c_str());
-        logger->LogError(L"%hs", msg2.c_str());
-        logger->LogError(L"%hs", msg3.c_str());
+        wchar_t str[] = { 226, 32, 295, 0 };
+        logger->WriteMessage(utf8_from_wstring(str).c_str(), false);
 
         ParseOutput();
 
-        TS_ASSERT_EQUALS((int)lines.size(), 4*4);
-        TS_ASSERT_EQUALS(lines[0], msg0);
-        TS_ASSERT_EQUALS(lines[1], msg1);
-        TS_ASSERT_EQUALS(lines[2], clipped);
-        TS_ASSERT_EQUALS(lines[3], clipped);
-
-        TS_ASSERT_EQUALS(lines[4], msg0);
-        TS_ASSERT_EQUALS(lines[5], msg1);
-        TS_ASSERT_EQUALS(lines[6], clipped);
-        TS_ASSERT_EQUALS(lines[7], clipped);
-
-        TS_ASSERT_EQUALS(lines[8], "WARNING: "+msg0);
-        TS_ASSERT_EQUALS(lines[9], "WARNING: "+msg1);
-        TS_ASSERT_EQUALS(lines[10], "WARNING: "+clipped);
-        TS_ASSERT_EQUALS(lines[11], "WARNING: "+clipped);
-
-        TS_ASSERT_EQUALS(lines[12], "ERROR: "+msg0);
-        TS_ASSERT_EQUALS(lines[13], "ERROR: "+msg1);
-        TS_ASSERT_EQUALS(lines[14], "ERROR: "+clipped);
-        TS_ASSERT_EQUALS(lines[15], "ERROR: "+clipped);
+        TS_ASSERT_EQUALS((int)lines.size(), 1);
+        TS_ASSERT_EQUALS(lines[0], "\xC3\xA2 \xC4\xA7");
     }
 
-    void test_unicode()
+    void test_html()
     {
-        logger->LogMessage(L"%lc %lc", 226, 295);
+        logger->WriteMessage("Test<a&b>c<d&e>", false);
 
         ParseOutput();
 
         TS_ASSERT_EQUALS((int)lines.size(), 1);
-        TS_ASSERT_EQUALS(lines[0], "\xC3\xA2 \xC4\xA7");
+        TS_ASSERT_EQUALS(lines[0], "Test&lt;a&amp;b>c&lt;d&amp;e>");
     }
 
-    void test_html()
+    void test_null()
     {
-        logger->LogMessage(L"Test<a&b>c<d&e>");
+        logger->WriteMessage(fmt::sprintf("a %s b", (const char *)NULL).c_str(), false);
 
         ParseOutput();
 
         TS_ASSERT_EQUALS((int)lines.size(), 1);
-        TS_ASSERT_EQUALS(lines[0], "Test&lt;a&amp;b>c&lt;d&amp;e>");
+        TS_ASSERT_EQUALS(lines[0], "a (null) b");
     }
 
     //////////////////////////////////////////////////////////////////////////

source/renderer/DecalRData.cpp

@@ -84 +84 @@
         
         if (material.GetShaderEffect().length() == 0)
         {
-            LOGERROR(L"Terrain renderer failed to load shader effect.\n");
+            LOGERROR("Terrain renderer failed to load shader effect.\n");
             continue;
         }
         
@@ -98 +98 @@
             
             if (!techBase)
             {
-                LOGERROR(L"Terrain renderer failed to load shader effect (%hs)\n",          
+                LOGERROR("Terrain renderer failed to load shader effect (%s)\n",            
                         material.GetShaderEffect().string().c_str());
                 continue;
             }

source/renderer/ModelRenderer.cpp

@@ -98 +98 @@
         // some broken situations
         if (numVertices && vertices[0].m_Blend.m_Bone[0] == 0xff)
         {
-            LOGERROR(L"Model %ls is boned with unboned animation", mdef->GetName().string().c_str());
+            LOGERROR("Model %s is boned with unboned animation", mdef->GetName().string8());
             return;
         }
 

source/renderer/PatchRData.cpp

@@ -766 +766 @@
         {
             if (itt->first->GetMaterial().GetShaderEffect().length() == 0)
             {
-                LOGERROR(L"Terrain renderer failed to load shader effect.\n");
+                LOGERROR("Terrain renderer failed to load shader effect.\n");
                 continue;
             }
                         

source/renderer/PostprocManager.cpp

@@ -159 +159 @@
     GLenum status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete (A): 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete (A): 0x%04X", status);
     }
     
     pglGenFramebuffersEXT(1, &m_PongFbo);
@@ -174 +174 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete (B): 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete (B): 0x%04X", status);
     }
     
     pglGenFramebuffersEXT(1, &m_BloomFbo);
@@ -187 +187 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete (B): 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete (B): 0x%04X", status);
     }
     */
 
@@ -519 +519 @@
     
     VfsPaths pathnames;
     if(vfs::GetPathnames(g_VFS, path, 0, pathnames) < 0)
-        LOGERROR(L"Error finding Post effects in '%ls'", path.string().c_str());
+        LOGERROR("Error finding Post effects in '%s'", path.string8());
 
     for(size_t i = 0; i < pathnames.size(); i++)
     {

source/renderer/Renderer.cpp

@@ -636 +636 @@
 
     GLint bits;
     glGetIntegerv(GL_DEPTH_BITS,&bits);
-    LOGMESSAGE(L"CRenderer::Open: depth bits %d",bits);
+    LOGMESSAGE("CRenderer::Open: depth bits %d",bits);
     glGetIntegerv(GL_STENCIL_BITS,&bits);
-    LOGMESSAGE(L"CRenderer::Open: stencil bits %d",bits);
+    LOGMESSAGE("CRenderer::Open: stencil bits %d",bits);
     glGetIntegerv(GL_ALPHA_BITS,&bits);
-    LOGMESSAGE(L"CRenderer::Open: alpha bits %d",bits);
+    LOGMESSAGE("CRenderer::Open: alpha bits %d",bits);
 
     // Validate the currently selected render path
     SetRenderPath(m_Options.m_RenderPath);
@@ -808 +808 @@
     {
         if (!(m_Caps.m_ARBProgram || (m_Caps.m_VertexShader && m_Caps.m_FragmentShader && m_Options.m_PreferGLSL)))
         {
-            LOGWARNING(L"Falling back to fixed function\n");
+            LOGWARNING("Falling back to fixed function\n");
             rp = RP_FIXED;
         }
     }
@@ -843 +843 @@
     if (name == "default")
         return RP_DEFAULT;
 
-    LOGWARNING(L"Unknown render path name '%hs', assuming 'default'", name.c_str());
+    LOGWARNING("Unknown render path name '%s', assuming 'default'", name.c_str());
     return RP_DEFAULT;
 }
 
@@ -1629 +1629 @@
         int err = glGetError();
         if (err)
         {
-            ONCE(LOGERROR(L"CRenderer::EndFrame: GL errors %i occurred", err));
+            ONCE(LOGERROR("CRenderer::EndFrame: GL errors %i occurred", err));
         }
     }
 }

source/renderer/ShadowMap.cpp

@@ -406 +406 @@
     default: formatname = "DEPTH_COMPONENT"; break;
     }
 
-    LOGMESSAGE(L"Creating shadow texture (size %dx%d) (format = %hs)",
+    LOGMESSAGE("Creating shadow texture (size %dx%d) (format = %s)",
         Width, Height, formatname);
 
 
@@ -494 +494 @@
 
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Framebuffer object incomplete: 0x%04X", status);
 
         // Disable shadow rendering (but let the user try again if they want)
         g_Renderer.m_Options.m_Shadows = false;

source/renderer/SkyManager.cpp

@@ -126 +126 @@
             if (g_VFS->LoadFile(path2, file, fileSize) < 0)
             {
                 glDeleteTextures(1, &m_SkyCubeMap);
-                LOGERROR(L"Error creating sky cubemap.");
+                LOGERROR("Error creating sky cubemap.");
                 return;
             }
         }
@@ -207 +207 @@
     DirectoryNames subdirectories;
     if(g_VFS->GetDirectoryEntries(path, 0, &subdirectories) < 0)
     {
-        LOGERROR(L"Error opening directory '%ls'", path.string().c_str());
+        LOGERROR("Error opening directory '%s'", path.string8());
         return std::vector<CStrW>(1, GetSkySet()); // just return what we currently have
     }
 

source/renderer/TerrainRenderer.cpp

@@ -653 +653 @@
         
         if (!m->fancyWaterShader)
         {
-            LOGERROR(L"Failed to load water shader. Falling back to fixed pipeline water.\n");
+            LOGERROR("Failed to load water shader. Falling back to fixed pipeline water.\n");
             WaterMgr->m_RenderWater = false;
             return false;
         }

source/renderer/VertexBufferManager.cpp

@@ -87 +87 @@
     
     if (!result)
     {
-        LOGERROR(L"Failed to create VBOs (%lu*%lu)", (unsigned long)vertexSize, (unsigned long)numVertices);
+        LOGERROR("Failed to create VBOs (%lu*%lu)", (unsigned long)vertexSize, (unsigned long)numVertices);
     }
 
     return result;

source/renderer/WaterManager.cpp

@@ -326 +326 @@
     GLenum status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Reflection framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Reflection framebuffer object incomplete: 0x%04X", status);
         g_Renderer.m_Options.m_WaterReflection = false;
     }
 
@@ -341 +341 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Refraction framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Refraction framebuffer object incomplete: 0x%04X", status);
         g_Renderer.m_Options.m_WaterRefraction = false;
     }
     
@@ -356 +356 @@
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
     {
-        LOGWARNING(L"Fancy Effects framebuffer object incomplete: 0x%04X", status);
+        LOGWARNING("Fancy Effects framebuffer object incomplete: 0x%04X", status);
         g_Renderer.m_Options.m_WaterRefraction = false;
     }
     

source/scriptinterface/DebuggingServer.cpp

@@ -94 +94 @@
     m_SettingBreakOnException = true;
 
     EnableHTTP();
-    LOGWARNING(L"Javascript debugging webserver enabled.");
+    LOGWARNING("Javascript debugging webserver enabled.");
 }
 
 CDebuggingServer::~CDebuggingServer()
@@ -396 +396 @@
 
     case MG_EVENT_LOG:
         // Called by Mongoose's cry()
-        LOGERROR(L"Mongoose error: %hs", request_info->log_message);
+        LOGERROR("Mongoose error: %s", request_info->log_message);
         return NULL;
 
     case MG_INIT_SSL:

source/scriptinterface/ScriptInterface.cpp

@@ -126 +126 @@
     }
 
     if (isWarning)
-        LOGWARNING(L"%hs", msg.str().c_str());
+        LOGWARNING("%s", msg.str().c_str());
     else
-        LOGERROR(L"%hs", msg.str().c_str());
+        LOGERROR("%s", msg.str().c_str());
 
     // When running under Valgrind, print more information in the error message
 //  VALGRIND_PRINTF_BACKTRACE("->");
@@ -163 +163 @@
     std::wstring str;
     if (!ScriptInterface::FromJSVal(cx, args.handleAt(0), str))
         return JS_FALSE;
-    LOGMESSAGE(L"%ls", 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(L"%ls", 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(L"%ls", str.c_str());
+    LOGERROR("%s", utf8_from_wstring(str));
     args.rval().setUndefined();
     return JS_TRUE;
 }
@@ -420 +420 @@
     if (g_JSDebuggerEnabled && g_DebuggingServer != NULL)
     {
         if(!JS_SetDebugMode(GetContext(), true))
-            LOGERROR(L"Failed to set Spidermonkey to debug mode!");
+            LOGERROR("Failed to set Spidermonkey to debug mode!");
         else
             g_DebuggingServer->RegisterScriptinterface(debugName, this);
     } */
@@ -478 +478 @@
     {
         if (!LoadGlobalScriptFile(*it))
         {
-            LOGERROR(L"LoadGlobalScripts: Failed to load script %ls", it->string().c_str());
+            LOGERROR("LoadGlobalScripts: Failed to load script %s", it->string8());
             return false;
         }
     }
@@ -507 +507 @@
         }
     }
 
-    LOGERROR(L"ReplaceNondeterministicRNG: failed to replace Math.random");
+    LOGERROR("ReplaceNondeterministicRNG: failed to replace Math.random");
     return false;
 }
 
@@ -543 +543 @@
     JSAutoRequest rq(m->m_cx);
     if (!ctor.isObject())
     {
-        LOGERROR(L"CallConstructor: ctor is not an object");
+        LOGERROR("CallConstructor: ctor is not an object");
         out.setNull();
         return;
     }
@@ -750 +750 @@
     
     if (!objVal.isObjectOrNull())
     {
-        LOGERROR(L"EnumeratePropertyNamesWithPrefix expected object type!");
+        LOGERROR("EnumeratePropertyNamesWithPrefix expected object type!");
         return false;
     }
         
@@ -866 +866 @@
     JSAutoRequest rq(m->m_cx);
     if (!VfsFileExists(path))
     {
-        LOGERROR(L"File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%s' does not exist", path.string8());
         return false;
     }
 
@@ -876 +876 @@
 
     if (ret != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%s': %s", path.string8(), GetErrorString(ret));
         return false;
     }
 
@@ -926 +926 @@
     if (JS_ParseJSON(m->m_cx, reinterpret_cast<const jschar*>(string.c_str()), (u32)string.size(), out))
         return true;
 
-    LOGERROR(L"JS_ParseJSON failed!");
+    LOGERROR("JS_ParseJSON failed!");
     if (!JS_IsExceptionPending(m->m_cx))
         return false;
 
@@ -946 +946 @@
 
     std::wstring error;
     ScriptInterface::FromJSVal(m->m_cx, rval, error);
-    LOGERROR(L"%ls", error.c_str());
+    LOGERROR("%s", utf8_from_wstring(error));
     return false;
 }
 
@@ -954 +954 @@
 {
     if (!VfsFileExists(path))
     {
-        LOGERROR(L"File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%s' does not exist", path.string8());
         return;
     }
 
@@ -964 +964 @@
 
     if (ret != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%s': %s", path.string8(), GetErrorString(ret));
         return;
     }
 
     std::string content(file.DecodeUTF8()); // assume it's UTF-8
 
     if (!ParseJSON(content, out))
-        LOGERROR(L"Failed to parse '%ls'", path.string().c_str());
+        LOGERROR("Failed to parse '%s'", path.string8());
 }
 
 struct Stringifier
@@ -1011 +1011 @@
     if (!JS_Stringify(m->m_cx, obj.address(), NULL, indentVal, &Stringifier::callback, &str))
     {
         JS_ClearPendingException(m->m_cx);
-        LOGERROR(L"StringifyJSON failed");
+        LOGERROR("StringifyJSON failed");
         return std::string();
     }
 

source/scriptinterface/ThreadDebugger.cpp

@@ -493 +493 @@
             *m->m_pLastBreakFrame = JS_FrameIterator(m->m_pScriptInterface->GetContext(), &iter);
             
             if (!JS_SetSingleStepMode(cx, script, true))
-                LOGERROR(L"JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
+                LOGERROR("JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
             else
             {
                 if (nextDbgCmd == DBG_CMD_SINGLESTEP)
@@ -516 +516 @@
         else if (nextDbgCmd == DBG_CMD_CONTINUE)
         {
             if (!JS_SetSingleStepMode(cx, script, true))
-                LOGERROR(L"JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
+                LOGERROR("JS_SetSingleStepMode returned false!"); // TODO: When can this happen?
             else
             {
                 // Setup a handler to check for break-requests from the DebuggingServer regularly
@@ -846 +846 @@
     JSObject* replacer = JS_GetFunctionObject(fun);
     if (!JS_Stringify(m->m_pScriptInterface->GetContext(), &obj, replacer, indent ? INT_TO_JSVAL(2) : JSVAL_VOID, &CyclicRefWorkaround::Stringifier::callback, &str))
     {
-        LOGERROR(L"StringifyJSON failed");
+        LOGERROR("StringifyJSON failed");
         jsval exec;
         jsval execString;
         if (JS_GetPendingException(m->m_pScriptInterface->GetContext(), &exec))
@@ -858 +858 @@
                 if (JSVAL_IS_STRING(execString))
                 {
                     std::string strExec = JS_EncodeString(m->m_pScriptInterface->GetContext(), JSVAL_TO_STRING(execString));
-                    LOGERROR(L"Error: %hs", strExec.c_str());
+                    LOGERROR("Error: %s", strExec.c_str());
                 }
             }
             

source/scriptinterface/tests/test_ScriptInterface.h

@@ -31 +31 @@
         ScriptInterface script("Test", "Test", g_ScriptRuntime);
         TestLogger logger;
         TS_ASSERT(script.LoadScript(L"test.js", "var x = 1+1;"));
-        TS_ASSERT_WSTR_NOT_CONTAINS(logger.GetOutput(), L"JavaScript error");
-        TS_ASSERT_WSTR_NOT_CONTAINS(logger.GetOutput(), L"JavaScript warning");
+        TS_ASSERT_STR_NOT_CONTAINS(logger.GetOutput(), "JavaScript error");
+        TS_ASSERT_STR_NOT_CONTAINS(logger.GetOutput(), "JavaScript warning");
     }
 
     void test_loadscript_error()
@@ -40 +40 @@
         ScriptInterface script("Test", "Test", g_ScriptRuntime);
         TestLogger logger;
         TS_ASSERT(!script.LoadScript(L"test.js", "1+"));
-        TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"JavaScript error: test.js line 1\nSyntaxError: syntax error");
+        TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "JavaScript error: test.js line 1\nSyntaxError: syntax error");
     }
 
     void test_loadscript_strict_warning()
@@ -49 +49 @@
         TestLogger logger;
         // in strict mode, this inside a function doesn't point to the global object
         TS_ASSERT(script.LoadScript(L"test.js", "var isStrict = (function() { return !this; })();warn('isStrict is '+isStrict);"));
-        TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"WARNING: isStrict is true");
+        TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "WARNING: isStrict is true");
     }
 
     void test_loadscript_strict_error()
@@ -57 +57 @@
         ScriptInterface script("Test", "Test", g_ScriptRuntime);
         TestLogger logger;
         TS_ASSERT(!script.LoadScript(L"test.js", "with(1){}"));
-        TS_ASSERT_WSTR_CONTAINS(logger.GetOutput(), L"JavaScript error: test.js line 1\nSyntaxError: strict mode code may not contain \'with\' statements");
+        TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "JavaScript error: test.js line 1\nSyntaxError: strict mode code may not contain \'with\' statements");
     }
 
     void test_clone_basic()

source/simulation2/Simulation2.cpp

@@ -187 +187 @@
         VfsPath filename = *it;
         if (loadedScripts)
             loadedScripts->insert(filename);
-        LOGMESSAGE(L"Loading simulation script '%ls'", filename.string().c_str());
+        LOGMESSAGE("Loading simulation script '%s'", filename.string8());
         if (!componentManager.LoadScript(filename))
             ok = false;
     }
@@ -204 +204 @@
         for (u32 i = 0; i < scriptNames.size(); ++i)
         {
             std::string scriptName = "maps/" + scriptNames[i];
-            LOGMESSAGE(L"Loading trigger script '%hs'", scriptName.c_str());
+            LOGMESSAGE("Loading trigger script '%s'", scriptName.c_str());
             if (!componentManager.LoadScript(scriptName.data()))
                 ok = false;
         }
@@ -224 +224 @@
     if (!VfsFileExists(path))
         return INFO::OK;
 
-    LOGMESSAGE(L"Reloading simulation script '%ls'", path.string().c_str());
+    LOGMESSAGE("Reloading simulation script '%s'", path.string8());
     if (!m_ComponentManager.LoadScript(path, true))
         return ERR::FAIL;
 
@@ -828 +828 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"Error reading directory '%ls': %ls", path.string().c_str(), 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>();
     }
 
@@ -840 +840 @@
         PSRETURN ret = file.Load(g_VFS, *it);
         if (ret != PSRETURN_OK)
         {
-            LOGERROR(L"GetJSONData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+            LOGERROR("GetJSONData: Failed to load file '%s': %s", path.string8(), GetErrorString(ret));
             continue;
         }
 
@@ -864 +864 @@
 {
     if (!VfsFileExists(path))
     {
-        LOGERROR(L"File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%s' does not exist", path.string8());
         return std::string();
     }
 
@@ -873 +873 @@
     PSRETURN ret = file.Load(g_VFS, path);
     if (ret != PSRETURN_OK)
     {
-        LOGERROR(L"Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%s': %s", path.string8(), GetErrorString(ret));
         return std::string();
     }
 

source/simulation2/components/CCmpAIManager.cpp

@@ -104 +104 @@
             m_Worker.LoadMetadata(path, &metadata);
             if (metadata.isUndefined())
             {
-                LOGERROR(L"Failed to create AI player: can't find %ls", path.string().c_str());
+                LOGERROR("Failed to create AI player: can't find %s", path.string8());
                 return false;
             }
 
@@ -116 +116 @@
             JS::RootedValue ctor(cx);
             if (!m_ScriptInterface->HasProperty(metadata, "moduleName"))
             {
-                LOGERROR(L"Failed to create AI player: %ls: missing 'moduleName'", path.string().c_str());
+                LOGERROR("Failed to create AI player: %s: missing 'moduleName'", path.string8());
                 return false;
             }
 
@@ -124 +124 @@
             if (!m_ScriptInterface->GetProperty(global, moduleName.c_str(), &objectWithConstructor)
                 || objectWithConstructor.isUndefined())
             {
-                LOGERROR(L"Failed to create AI player: %ls: can't find the module that should contain the constructor: '%hs'", path.string().c_str(), 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;
             }
 
             if (!m_ScriptInterface->GetProperty(metadata, "constructor", constructor))
             {
-                LOGERROR(L"Failed to create AI player: %ls: missing 'constructor'", path.string().c_str());
+                LOGERROR("Failed to create AI player: %s: missing 'constructor'", path.string8());
                 return false;
             }
 
@@ -138 +138 @@
             if (!m_ScriptInterface->GetProperty(objectWithConstructor, constructor.c_str(), &ctor)
                 || ctor.isNull())
             {
-                LOGERROR(L"Failed to create AI player: %ls: can't find constructor '%hs'", path.string().c_str(), 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(L"Failed to create AI player: %ls: error calling constructor '%hs'", path.string().c_str(), 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(L"Failed to load AI scripts for module %ls", moduleName.c_str());
+            LOGERROR("Failed to load AI scripts for module %s", utf8_from_wstring(moduleName));
             return false;
         }
 
@@ -269 +269 @@
         {
             if (!m_ScriptInterface->LoadGlobalScriptFile(*it))
             {
-                LOGERROR(L"Failed to load script %ls", it->string().c_str());
+                LOGERROR("Failed to load script %s", it->string8());
                 return false;
             }
         }
@@ -308 +308 @@
             }
         }
         
-        LOGERROR(L"Invalid playerid in PostCommand!");  
+        LOGERROR("Invalid playerid in PostCommand!");   
     }
     // The next two ought to be implmeneted someday but for now as it returns "null" it can't
     static void DumpHeap(ScriptInterface::CxPrivate* pCxPrivate)
@@ -391 +391 @@
         JS::RootedValue ctor(cx);
         if (!m_ScriptInterface->GetProperty(global, "API3", &AIModule) || AIModule.isUndefined())
         {
-            LOGERROR(L"Failed to create shared AI component: %ls: can't find module '%hs'", path.string().c_str(), "API3");
+            LOGERROR("Failed to create shared AI component: %s: can't find module '%s'", path.string8(), "API3");
             return false;
         }
         
         if (!m_ScriptInterface->GetProperty(AIModule, "SharedScript", &ctor)
             || ctor.isUndefined())
         {
-            LOGERROR(L"Failed to create shared AI component: %ls: can't find constructor '%hs'", path.string().c_str(), "SharedScript");
+            LOGERROR("Failed to create shared AI component: %s: can't find constructor '%s'", path.string8(), "SharedScript");
             return false;
         }
         
@@ -440 +440 @@
         
         if (tmpSharedAIObj.isNull())
         {
-            LOGERROR(L"Failed to create shared AI component: %ls: error calling constructor '%hs'", path.string().c_str(), "SharedScript");
+            LOGERROR("Failed to create shared AI component: %s: error calling constructor '%s'", path.string8(), "SharedScript");
             return false;
         }
         
@@ -617 +617 @@
             JS::RootedValue sharedData(cx);
             JS::RootedValue tmpSharedAIObj(cx, m_SharedAIObj.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade
             if (!m_ScriptInterface->CallFunction(tmpSharedAIObj, "Serialize", &sharedData))
-                LOGERROR(L"AI shared script Serialize call failed");
+                LOGERROR("AI shared script Serialize call failed");
             serializer.ScriptVal("sharedData", &sharedData);
         }
         for (size_t i = 0; i < m_Players.size(); ++i)
@@ -640 +640 @@
             {
                 JS::RootedValue scriptData(cx);
                 if (!m_ScriptInterface->CallFunction(tmpPlayerObj, "Serialize", &scriptData))
-                    LOGERROR(L"AI script Serialize call failed");
+                    LOGERROR("AI script Serialize call failed");
                 serializer.ScriptVal("data", &scriptData);
             }
             else
@@ -681 +681 @@
             JS::RootedValue tmpSharedAIObj(cx, m_SharedAIObj.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31
             deserializer.ScriptVal("sharedData", &sharedData);
             if (!m_ScriptInterface->CallFunctionVoid(tmpSharedAIObj, "Deserialize", sharedData))
-                LOGERROR(L"AI shared script Deserialize call failed");
+                LOGERROR("AI shared script Deserialize call failed");
         }
 
         for (size_t i = 0; i < numAis; ++i)
@@ -720 +720 @@
                 if (m_Players[i]->m_UseSharedComponent)
                 {
                     if (!m_ScriptInterface->CallFunctionVoid(tmpPlayerObj, "Deserialize", scriptData, m_SharedAIObj))
-                        LOGERROR(L"AI script Deserialize call failed");
+                        LOGERROR("AI script Deserialize call failed");
                 }
                 else if (!m_ScriptInterface->CallFunctionVoid(tmpPlayerObj, "Deserialize", scriptData))
                 {
-                    LOGERROR(L"AI script deserialize() call failed");
+                    LOGERROR("AI script deserialize() call failed");
                 }
             }
             else
@@ -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(L"RegisterSerializablePrototype called with same prototype multiple times: p=%p n='%ls'", 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/CCmpCommandQueue.cpp

@@ -119 +119 @@
         {
             bool ok = scriptInterface.CallFunctionVoid(global, "ProcessCommand", localCommands[i].player, localCommands[i].data);
             if (!ok)
-                LOGERROR(L"Failed to call ProcessCommand() global script function");
+                LOGERROR("Failed to call ProcessCommand() global script function");
         }
 
         for (size_t i = 0; i < commands.size(); ++i)
         {
             bool ok = scriptInterface.CallFunctionVoid(global, "ProcessCommand", commands[i].player, commands[i].data);
             if (!ok)
-                LOGERROR(L"Failed to call ProcessCommand() global script function");
+                LOGERROR("Failed to call ProcessCommand() global script function");
         }
     }
 };

source/simulation2/components/CCmpObstruction.cpp

@@ -515 +515 @@
         // required precondition to use SkipControlGroupsRequireFlagObstructionFilter
         if (m_ControlGroup == INVALID_ENTITY)
         {
-            LOGERROR(L"[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
+            LOGERROR("[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
             return FOUNDATION_CHECK_FAIL_ERROR;
         }
 
@@ -552 +552 @@
         // required precondition to use SkipControlGroupsRequireFlagObstructionFilter
         if (m_ControlGroup == INVALID_ENTITY)
         {
-            LOGERROR(L"[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
+            LOGERROR("[CmpObstruction] Cannot test for foundation obstructions; primary control group must be valid");
             return false;
         }
 
@@ -586 +586 @@
         // required precondition to use SkipControlGroupsRequireFlagObstructionFilter
         if (m_ControlGroup == INVALID_ENTITY)
         {
-            LOGERROR(L"[CmpObstruction] Cannot test for unit or structure obstructions; primary control group must be valid");
+            LOGERROR("[CmpObstruction] Cannot test for unit or structure obstructions; primary control group must be valid");
             return ret;
         }
 

source/simulation2/components/CCmpPathfinder.cpp

@@ -254 +254 @@
 {
     if (m_PassClassMasks.find(name) == m_PassClassMasks.end())
     {
-        LOGERROR(L"Invalid passability class name '%hs'", name.c_str());
+        LOGERROR("Invalid passability class name '%s'", name.c_str());
         return 0;
     }
 
@@ -270 +270 @@
 {
     if (m_UnitCostClassTags.find(name) == m_UnitCostClassTags.end())
     {
-        LOGERROR(L"Invalid unit cost class name '%hs'", name.c_str());
+        LOGERROR("Invalid unit cost class name '%s'", name.c_str());
         return m_UnitCostClassTags["default"];
     }
 

source/simulation2/components/CCmpPosition.cpp

@@ -271 +271 @@
         CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), m_TurretParent);
         if (!cmpPosition)
         {
-            LOGERROR(L"Turret with parent without position component");
+            LOGERROR("Turret with parent without position component");
             return;
         }
         if (!cmpPosition->IsInWorld())
@@ -482 +482 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetPosition called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetPosition called on entity when IsInWorld is false");
             return CFixedVector3D();
         }
 
@@ -493 +493 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetPosition2D called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetPosition2D called on entity when IsInWorld is false");
             return CFixedVector2D();
         }
 
@@ -504 +504 @@
     { 
         if (!m_InWorld) 
         { 
-            LOGERROR(L"CCmpPosition::GetPreviousPosition called on entity when IsInWorld is false"); 
+            LOGERROR("CCmpPosition::GetPreviousPosition called on entity when IsInWorld is false"); 
             return CFixedVector3D(); 
         } 
 
@@ -515 +515 @@
     { 
         if (!m_InWorld) 
         { 
-            LOGERROR(L"CCmpPosition::GetPreviousPosition2D called on entity when IsInWorld is false"); 
+            LOGERROR("CCmpPosition::GetPreviousPosition2D called on entity when IsInWorld is false"); 
             return CFixedVector2D(); 
         } 
 
@@ -589 +589 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetDistanceTravelled called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetDistanceTravelled called on entity when IsInWorld is false");
             return fixed::Zero();
         }
 
@@ -630 +630 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetInterpolatedPosition2D called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetInterpolatedPosition2D called on entity when IsInWorld is false");
             return;
         }
 
@@ -647 +647 @@
             CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), m_TurretParent);
             if (!cmpPosition)
             {
-                LOGERROR(L"Turret with parent without position component");
+                LOGERROR("Turret with parent without position component");
                 CMatrix3D m;
                 m.SetIdentity();
                 return m;
             }
             if (!cmpPosition->IsInWorld())
             {
-                LOGERROR(L"CCmpPosition::GetInterpolatedTransform called on turret entity when IsInWorld is false");
+                LOGERROR("CCmpPosition::GetInterpolatedTransform called on turret entity when IsInWorld is false");
                 CMatrix3D m;
                 m.SetIdentity();
                 return m;
@@ -670 +670 @@
         }
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::GetInterpolatedTransform called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::GetInterpolatedTransform called on entity when IsInWorld is false");
             CMatrix3D m;
             m.SetIdentity();
             return m;
@@ -925 +925 @@
     {
         if (!m_InWorld)
         {
-            LOGERROR(L"CCmpPosition::UpdateXZRotation called on entity when IsInWorld is false");
+            LOGERROR("CCmpPosition::UpdateXZRotation called on entity when IsInWorld is false");
             return;
         }
 
@@ -940 +940 @@
         CmpPtr<ICmpTerrain> cmpTerrain(GetSystemEntity());
         if (!cmpTerrain || !cmpTerrain->IsLoaded())
         {
-            LOGERROR(L"Terrain not loaded");
+            LOGERROR("Terrain not loaded");
             return;
         }
 

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(L"Unit with actor '%ls' 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/components/CCmpRallyPointRenderer.cpp

@@ -521 +521 @@
 
         // the marker entity should be valid at this point, otherwise something went wrong trying to allocate it
         if (m_MarkerEntityIds[i] == INVALID_ENTITY)
-            LOGERROR(L"Failed to create rally point marker entity");
+            LOGERROR("Failed to create rally point marker entity");
 
         CmpPtr<ICmpPosition> markerCmpPosition(GetSimContext(), m_MarkerEntityIds[i]);
         if (markerCmpPosition)

source/simulation2/components/CCmpRangeManager.cpp

@@ -738 +738 @@
     {
         if (m_Queries.find(tag) == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: DestroyActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: DestroyActiveQuery called with invalid tag %u", tag);
             return;
         }
 
@@ -750 +750 @@
         std::map<tag_t, Query>::iterator it = m_Queries.find(tag);
         if (it == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: EnableActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: EnableActiveQuery called with invalid tag %u", tag);
             return;
         }
 
@@ -763 +763 @@
         std::map<tag_t, Query>::iterator it = m_Queries.find(tag);
         if (it == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: DisableActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: DisableActiveQuery called with invalid tag %u", tag);
             return;
         }
 
@@ -820 +820 @@
         std::map<tag_t, Query>::iterator it = m_Queries.find(tag);
         if (it == m_Queries.end())
         {
-            LOGERROR(L"CCmpRangeManager: ResetActiveQuery called with invalid tag %u", tag);
+            LOGERROR("CCmpRangeManager: ResetActiveQuery called with invalid tag %u", tag);
             return r;
         }
 
@@ -1156 +1156 @@
     {
         // Min range must be non-negative
         if (minRange < entity_pos_t::Zero())
-            LOGWARNING(L"CCmpRangeManager: Invalid min range %f in query for entity %u", minRange.ToDouble(), source);
+            LOGWARNING("CCmpRangeManager: Invalid min range %f in query for entity %u", minRange.ToDouble(), source);
 
         // Max range must be non-negative, or else -1
         if (maxRange < entity_pos_t::Zero() && maxRange != entity_pos_t::FromInt(-1))
-            LOGWARNING(L"CCmpRangeManager: Invalid max range %f in query for entity %u", maxRange.ToDouble(), source);
+            LOGWARNING("CCmpRangeManager: Invalid max range %f in query for entity %u", maxRange.ToDouble(), source);
 
         Query q;
         q.enabled = false;
@@ -1337 +1337 @@
         if (identifier == "injured")
             return 2;
 
-        LOGWARNING(L"CCmpRangeManager: Invalid flag identifier %hs", identifier.c_str());
+        LOGWARNING("CCmpRangeManager: Invalid flag identifier %s", identifier.c_str());
         return 0;
     }
 
@@ -1354 +1354 @@
         // We don't have a flag set
         if (flag == 0)
         {
-            LOGWARNING(L"CCmpRangeManager: Invalid flag identifier %hs for entity %u", identifier.c_str(), ent);
+            LOGWARNING("CCmpRangeManager: Invalid flag identifier %s for entity %u", identifier.c_str(), ent);
             return;
         }
 

source/simulation2/components/CCmpTemplateManager.cpp

@@ -187 +187 @@
 
             // Show error on the first failure to validate the template
             if (!m_TemplateSchemaValidity[templateName])
-                LOGERROR(L"Failed to validate entity template '%hs'", templateName.c_str());
+                LOGERROR("Failed to validate entity template '%s'", templateName.c_str());
         }
         // Refuse to return invalid templates
         if (!m_TemplateSchemaValidity[templateName])
@@ -198 +198 @@
     if (!templateRoot.IsOk())
     {
         // The validator should never let this happen
-        LOGERROR(L"Invalid root element in entity template '%hs'", templateName.c_str());
+        LOGERROR("Invalid root element in entity template '%s'", templateName.c_str());
         return NULL;
     }
 

source/simulation2/components/CCmpUnitMotion.cpp

@@ -814 +814 @@
     }
     else
     {
-        LOGWARNING(L"unexpected PathResult (%u %d %d)", GetEntityId(), m_State, m_PathState);
+        LOGWARNING("unexpected PathResult (%u %d %d)", GetEntityId(), m_State, m_PathState);
     }
 }
 

source/simulation2/components/CCmpVisualActor.cpp

@@ -655 +655 @@
             }
             else
             {
-                LOGERROR(L"[VisualActor] Cannot apply footprint-based SelectionShape; Footprint component not initialized.");
+                LOGERROR("[VisualActor] Cannot apply footprint-based SelectionShape; Footprint component not initialized.");
             }
         }
         else if (shapeNode.GetChild("Box").IsOk())
@@ -669 +669 @@
         }
         else if (shapeNode.GetChild("Cylinder").IsOk())
         {
-            LOGWARNING(L"[VisualActor] TODO: Cylinder selection shapes are not yet implemented; defaulting to recursive bounding boxes");
+            LOGWARNING("[VisualActor] TODO: Cylinder selection shapes are not yet implemented; defaulting to recursive bounding boxes");
         }
         else
         {
             // shouldn't happen by virtue of validation against schema
-            LOGERROR(L"[VisualActor] No selection shape specified");
+            LOGERROR("[VisualActor] No selection shape specified");
         }
     }
 

source/simulation2/components/ICmpVisibility.cpp

@@ -43 +43 @@
         case ICmpRangeManager::VIS_VISIBLE:
             return ICmpRangeManager::VIS_VISIBLE;
         default:
-            LOGERROR(L"Received the invalid visibility value %d from the Visibility scripted component!", visibility);
+            LOGERROR("Received the invalid visibility value %d from the Visibility scripted component!", visibility);
             return ICmpRangeManager::VIS_HIDDEN;
         }
     }

source/simulation2/scripting/EngineScriptConversions.cpp

@@ -55 +55 @@
     if (!val->NewJSObject(*ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface, &obj))
     {
         // Report as an error, since scripts really shouldn't try to use unscriptable interfaces
-        LOGERROR(L"IComponent does not have a scriptable interface");
+        LOGERROR("IComponent does not have a scriptable interface");
         ret.setUndefined();
         return;
     }

source/simulation2/scripting/MessageTypeConversions.cpp

@@ -119 +119 @@
 
 JS::Value CMessageRenderSubmit::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageRenderSubmit::ToJSVal not implemented");
+    LOGWARNING("CMessageRenderSubmit::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageRenderSubmit::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageRenderSubmit::FromJSVal not implemented");
+    LOGWARNING("CMessageRenderSubmit::FromJSVal not implemented");
     return NULL;
 }
 
@@ -133 +133 @@
 
 JS::Value CMessageProgressiveLoad::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageProgressiveLoad::ToJSVal not implemented");
+    LOGWARNING("CMessageProgressiveLoad::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageProgressiveLoad::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageProgressiveLoad::FromJSVal not implemented");
+    LOGWARNING("CMessageProgressiveLoad::FromJSVal not implemented");
     return NULL;
 }
 
@@ -147 +147 @@
 
 JS::Value CMessageDeserialized::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageDeserialized::ToJSVal not implemented");
+    LOGWARNING("CMessageDeserialized::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageDeserialized::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageDeserialized::FromJSVal not implemented");
+    LOGWARNING("CMessageDeserialized::FromJSVal not implemented");
     return NULL;
 }
 
@@ -237 +237 @@
 
 JS::Value CMessageInterpolatedPositionChanged::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessageInterpolatedPositionChanged::ToJSVal not implemented");
+    LOGWARNING("CMessageInterpolatedPositionChanged::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessageInterpolatedPositionChanged::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageInterpolatedPositionChanged::FromJSVal not implemented");
+    LOGWARNING("CMessageInterpolatedPositionChanged::FromJSVal not implemented");
     return NULL;
 }
 
@@ -379 +379 @@
 
 CMessage* CMessageRangeUpdate::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessageRangeUpdate::FromJSVal not implemented");
+    LOGWARNING("CMessageRangeUpdate::FromJSVal not implemented");
     return NULL;
 }
 
@@ -387 +387 @@
 
 JS::Value CMessagePathResult::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
 {
-    LOGWARNING(L"CMessagePathResult::ToJSVal not implemented");
+    LOGWARNING("CMessagePathResult::ToJSVal not implemented");
     return JS::UndefinedValue();
 }
 
 CMessage* CMessagePathResult::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
 {
-    LOGWARNING(L"CMessagePathResult::FromJSVal not implemented");
+    LOGWARNING("CMessagePathResult::FromJSVal not implemented");
     return NULL;
 }
 

source/simulation2/scripting/ScriptComponent.cpp

@@ -73 +73 @@
 
     JS::RootedValue tmpInstance(cx, m_Instance.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade 
     if (!m_ScriptInterface.CallFunctionVoid(tmpInstance, name, msgVal))
-        LOGERROR(L"Script message handler %hs failed", name);
+        LOGERROR("Script message handler %s failed", name);
 }
 
 void CComponentTypeScript::Serialize(ISerializer& serialize)
@@ -92 +92 @@
     {
         JS::RootedValue val(cx);
         if (!m_ScriptInterface.CallFunction(tmpInstance, "Serialize", &val))
-            LOGERROR(L"Script Serialize call failed");
+            LOGERROR("Script Serialize call failed");
         serialize.ScriptVal("object", &val);
     }
     else
@@ -118 +118 @@
             deserialize.ScriptVal("object", &val);
 
         if (!m_ScriptInterface.CallFunctionVoid(tmpInstance, "Deserialize", val))
-            LOGERROR(L"Script Deserialize call failed");
+            LOGERROR("Script Deserialize call failed");
     }
     else
     {

source/simulation2/scripting/ScriptComponent.h

@@ -64 +64 @@
         R ret; \
         if (m_ScriptInterface.CallFunction(tmpInstance, funcname  BOOST_PP_ENUM_TRAILING_PARAMS(i, a), ret)) \
             return ret; \
-        LOGERROR(L"Error calling component script function %hs", funcname); \
+        LOGERROR("Error calling component script function %s", funcname); \
         return R(); \
     } \
     BOOST_PP_IF(i, template<, ) BOOST_PP_ENUM_PARAMS(i, typename T) BOOST_PP_IF(i, >, ) \
@@ -75 +75 @@
         JS::RootedValue tmpInstance(cx, m_Instance.get()); \
         if (m_ScriptInterface.CallFunctionVoid(tmpInstance, funcname  BOOST_PP_ENUM_TRAILING_PARAMS(i, a))) \
             return; \
-        LOGERROR(L"Error calling component script function %hs", funcname); \
+        LOGERROR("Error calling component script function %s", funcname); \
     }
 BOOST_PP_REPEAT(SCRIPT_INTERFACE_MAX_ARGS, OVERLOADS, ~)
 #undef OVERLOADS

source/simulation2/serialization/BinarySerializer.cpp

@@ -49 +49 @@
     case js::ArrayBufferView::TYPE_UINT8_CLAMPED:
         return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
     default:
-        LOGERROR(L"Cannot serialize unrecognized typed array view: %d", arrayType);
+        LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
         throw PSERROR_Serialize_InvalidScriptValue();
     }
 }
@@ -258 +258 @@
             else
             {
                 // Unrecognized class
-                LOGERROR(L"Cannot serialise JS objects with unrecognized class '%hs'", jsclass->name);
+                LOGERROR("Cannot serialise JS objects with unrecognized class '%s'", jsclass->name);
                 throw PSERROR_Serialize_InvalidScriptValue();
             }
         }
@@ -317 +317 @@
             }
         }
 
-        LOGERROR(L"Cannot serialise JS objects of type 'function': %ls", 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

@@ -429 +429 @@
 CMessage* CComponentManager::ConstructMessage(int mtid, JS::HandleValue data)
 {
     if (mtid == MT__Invalid || mtid > (int)m_MessageTypeIdsByName.size()) // (IDs start at 1 so use '>' here)
-        LOGERROR(L"PostMessage with invalid message type ID '%d'", mtid);
+        LOGERROR("PostMessage with invalid message type ID '%d'", mtid);
 
     if (mtid < MT__LastNative)
     {
@@ -672 +672 @@
     for (; iiit != m_InterfaceIdsByName.end(); ++iiit)
         if (iiit->second == iid)
         {
-            LOGERROR(L"No script wrapper found for interface id %d '%hs'", iid, iiit->first.c_str());
+            LOGERROR("No script wrapper found for interface id %d '%s'", iid, iiit->first.c_str());
             return CID__Invalid;
         }
 
-    LOGERROR(L"No script wrapper found for interface id %d", iid);
+    LOGERROR("No script wrapper found for interface id %d", iid);
     return CID__Invalid;
 }
 
@@ -753 +753 @@
     std::map<ComponentTypeId, ComponentType>::const_iterator it = m_ComponentTypesById.find(cid);
     if (it == m_ComponentTypesById.end())
     {
-        LOGERROR(L"Invalid component id %d", cid);
+        LOGERROR("Invalid component id %d", cid);
         return NULL;
     }
 
@@ -764 +764 @@
     boost::unordered_map<entity_id_t, IComponent*>& emap1 = m_ComponentsByInterface[ct.iid];
     if (emap1.find(ent.GetId()) != emap1.end())
     {
-        LOGERROR(L"Multiple components for interface %d", ct.iid);
+        LOGERROR("Multiple components for interface %d", ct.iid);
         return NULL;
     }
 
@@ -780 +780 @@
         m_ScriptInterface.CallConstructor(tmpCtor, argv, &obj);
         if (obj.isNull())
         {
-            LOGERROR(L"Script component constructor failed");
+            LOGERROR("Script component constructor failed");
             return NULL;
         }
     }
@@ -887 +887 @@
         CComponentManager::ComponentTypeId cid = LookupCID(it->first);
         if (cid == CID__Invalid)
         {
-            LOGERROR(L"Unrecognised component type name '%hs' in entity template '%ls'", 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(L"Failed to construct component type name '%hs' in entity template '%ls'", 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(L"Error reading directory '%ls': %ls", cbData.path.string().c_str(), 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/ComponentManagerSerialization.cpp

@@ -322 +322 @@
             ComponentTypeId ctid = LookupCID(ctname);
             if (ctid == CID__Invalid)
             {
-                LOGERROR(L"Deserialization saw unrecognised component type '%hs'", ctname.c_str());
+                LOGERROR("Deserialization saw unrecognised component type '%s'", ctname.c_str());
                 return false;
             }
 
@@ -349 +349 @@
             ComponentTypeId ctid = LookupCID(ctname);
             if (ctid == CID__Invalid)
             {
-                LOGERROR(L"Deserialization saw unrecognised component type '%hs'", ctname.c_str());
+                LOGERROR("Deserialization saw unrecognised component type '%s'", ctname.c_str());
                 return false;
             }
 
@@ -379 +379 @@
 
         if (stream.peek() != EOF)
         {
-            LOGERROR(L"Deserialization didn't reach EOF");
+            LOGERROR("Deserialization didn't reach EOF");
             return false;
         }
 
@@ -391 +391 @@
     }
     catch (PSERROR_Deserialize& e)
     {
-        LOGERROR(L"Deserialization failed: %hs", e.what());
+        LOGERROR("Deserialization failed: %s", e.what());
         return false;
     }
 }

source/simulation2/system/ParamNode.cpp

@@ -123 +123 @@
                         if (tokenIt != tokens.end())
                             tokens.erase(tokenIt);
                         else
-                            LOGWARNING(L"[ParamNode] Could not remove token '%ls' from node '%hs'%ls; 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"");
+                            LOGWARNING("[ParamNode] Could not remove token '%s' from node '%s'%s; not present in list nor inherited (possible typo?)",
+                                utf8_from_wstring(newTokens[i].substr(1)), name, sourceIdentifier ? (" in '" + utf8_from_wstring(sourceIdentifier) + "'").c_str() : "");
                     }
                     else
                     {

source/simulation2/tests/test_ComponentManager.h

@@ -109 +109 @@
         {
             TestLogger log;
             TS_ASSERT(! man.AddComponent(hnd1, 12345, noParam));
-            TS_ASSERT_WSTR_CONTAINS(log.GetOutput(), L"ERROR: Invalid component id 12345");
+            TS_ASSERT_STR_CONTAINS(log.GetOutput(), "ERROR: Invalid component id 12345");
         }
 
         {
             TestLogger log;
             TS_ASSERT(! man.AddComponent(hnd1, CID_Test1B, noParam));
-            TS_ASSERT_WSTR_CONTAINS(log.GetOutput(), L"ERROR: Multiple components for interface ");
+            TS_ASSERT_STR_CONTAINS(log.GetOutput(), "ERROR: Multiple components for interface ");
         }
     }
 
@@ -347 +347 @@
             // In SpiderMonkey 1.6, JS_ReportError calls the error reporter even if it's inside
             // a try{} in the script; in recent versions (not sure when it changed) it doesn't
             // so the error here won't get reported.
-            TS_ASSERT_WSTR_NOT_CONTAINS(log.GetOutput(), L"ERROR: JavaScript error: simulation/components/error.js line 4\nInvalid interface id");
+            TS_ASSERT_STR_NOT_CONTAINS(log.GetOutput(), "ERROR: JavaScript error: simulation/components/error.js line 4\nInvalid interface id");
         }
     }
 

source/soundmanager/SoundManager.cpp

@@ -204 +204 @@
 
 void CSoundManager::al_ReportError(ALenum err, const char* caller, int line)
 {
-    LOGERROR(L"OpenAL error: %hs; called from %hs (line %d)\n", alGetString(err), caller, line);
+    LOGERROR("OpenAL error: %s; called from %s (line %d)\n", alGetString(err), caller, line);
 }
 
 void CSoundManager::al_check(const char* caller, int line)
@@ -216 +216 @@
 
 Status CSoundManager::ReloadChangedFiles(const VfsPath& UNUSED(path))
 {
-//  LOGERROR(L"GUI file '%ls' changed - reloading page", path.string().c_str());
+//  LOGERROR("GUI file '%s' changed - reloading page", path.string8());
 
     return INFO::OK;
 }
@@ -338 +338 @@
             }
             else
             {
-                LOGERROR(L"error in gensource = %d", err);
+                LOGERROR("error in gensource = %d", err);
             }
             delete[] sourceList;
         }
@@ -354 +354 @@
         debug_printf(L"Sound: AlcInit success, using %hs\n", dev_name);
     else
     {
-        LOGERROR(L"Sound: AlcInit failed, m_Device=%p m_Context=%p dev_name=%hs 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
@@ -654 +654 @@
         group = new CSoundGroup();
         if (!group->LoadSoundGroup(L"audio/" + groupPath.string()))
         {
-            LOGERROR(L"Failed to load sound group '%ls'", groupPath.string().c_str());
+            LOGERROR("Failed to load sound group '%s'", groupPath.string8());
             delete group;
             group = NULL;
         }

source/soundmanager/data/OggData.cpp

@@ -78 +78 @@
             
             if(alGetError() != AL_NO_ERROR) 
             {
-                LOGERROR( L"- Error creating initial buffer !!\n");
+                LOGERROR( "- Error creating initial buffer !!\n");
                 return false;
             }
             else

source/soundmanager/data/SoundData.cpp

@@ -107 +107 @@
     }
     else
     {
-        LOGERROR(L"could not initialize ogg data at %ls", itemPath.string().c_str());
+        LOGERROR("could not initialize ogg data at %s", itemPath.string8());
         delete oggAnswer;
     }
 

source/soundmanager/items/CSoundBase.cpp

@@ -112 +112 @@
     }
     else
     {
-//      LOGERROR(L"Source not allocated by SoundManager\n", 0);
+//      LOGERROR("Source not allocated by SoundManager\n", 0);
     }
     return false;
 }

source/soundmanager/scripting/SoundGroup.cpp

@@ -197 +197 @@
             itemRollOff = 0;
         
         if ( sndData->IsStereo() )
-            LOGWARNING( L"OpenAL: stereo sounds can't be positioned: %ls", sndData->GetFileName()->string().c_str() );
+            LOGWARNING( "OpenAL: stereo sounds can't be positioned: %s", sndData->GetFileName()->string8() );
 
         hSound->SetLocation(CVector3D((sndDist * sin(offSet)), 0, - sndDist * cos(offSet)));
         hSound->SetRollOff(itemRollOff);
@@ -227 +227 @@
 {
     if (err == ERR::AGAIN)
         return; // open failed because sound is disabled (don't log this)
-    LOGERROR(L"%ls: pathname=%ls, error=%ls", message.c_str(), pathname.string().c_str(), 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)
@@ -320 +320 @@
 
     if (root.GetNodeName() != el_soundgroup)
     {
-        LOGERROR(L"Invalid SoundGroup format (unrecognised root element '%hs')", XeroFile.GetElementString(root.GetNodeName()).c_str());
+        LOGERROR("Invalid SoundGroup format (unrecognised root element '%s')", XeroFile.GetElementString(root.GetNodeName()).c_str());
         return false;
     }
     

source/test_setup.cpp

@@ -100 +100 @@
 
 // Definition of functions from lib/self_test.h
 
+bool ts_str_contains(const std::string& str1, const std::string& str2)
+{
+    return str1.find(str2) != str1.npos;
+}
+
 bool ts_str_contains(const std::wstring& str1, const std::wstring& str2)
 {
     return str1.find(str2) != str1.npos;

new file source/third_party/cppformat/format.cpp

@@ +1 @@
+/*
+ * Slightly modified version of cppformat, by Wildfire Games, for 0 A.D.
+ * Based on cppformat v0.11.0 from https://github.com/cppformat/cppformat
+ */
+
+/*
+ Formatting library for C++
+
+ Copyright (c) 2012 - 2014, Victor Zverovich
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// Disable useless MSVC warnings.
+#undef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#undef _SCL_SECURE_NO_WARNINGS
+#define _SCL_SECURE_NO_WARNINGS
+
+#include "format.h"
+
+#include <string.h>
+
+#include <cctype>
+#include <cerrno>
+#include <climits>
+#include <cmath>
+#include <cstdarg>
+
+#ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
+# ifdef __MINGW32__
+#  include <cstring>
+# endif
+# include <windows.h>
+# undef ERROR
+#endif
+
+using fmt::LongLong;
+using fmt::ULongLong;
+using fmt::internal::Arg;
+
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4127) // conditional expression is constant
+#endif
+
+namespace {
+
+#ifndef _MSC_VER
+
+// Portable version of signbit.
+// When compiled in C++11 mode signbit is no longer a macro but a function
+// defined in namespace std and the macro is undefined.
+inline int getsign(double x) {
+#ifdef signbit
+  return signbit(x);
+#else
+  return std::signbit(x);
+#endif
+}
+
+// Portable version of isinf.
+#ifdef isinf
+inline int isinfinity(double x) { return isinf(x); }
+inline int isinfinity(long double x) { return isinf(x); }
+#else
+inline int isinfinity(double x) { return std::isinf(x); }
+inline int isinfinity(long double x) { return std::isinf(x); }
+#endif
+
+#define FMT_SNPRINTF snprintf
+
+#else  // _MSC_VER
+
+inline int getsign(double value) {
+  if (value < 0) return 1;
+  if (value == value) return 0;
+  int dec = 0, sign = 0;
+  char buffer[2];  // The buffer size must be >= 2 or _ecvt_s will fail.
+  _ecvt_s(buffer, sizeof(buffer), value, 0, &dec, &sign);
+  return sign;
+}
+
+inline int isinfinity(double x) { return !_finite(x); }
+
+inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
+  va_end(args);
+  return result;
+}
+#define FMT_SNPRINTF fmt_snprintf
+
+#endif  // _MSC_VER
+
+template <typename T>
+struct IsLongDouble { enum {VALUE = 0}; };
+
+template <>
+struct IsLongDouble<long double> { enum {VALUE = 1}; };
+
+// Checks if a value fits in int - used to avoid warnings about comparing
+// signed and unsigned integers.
+template <bool IsSigned>
+struct IntChecker {
+  template <typename T>
+  static bool fits_in_int(T value) {
+    unsigned max = INT_MAX;
+    return value <= max;
+  }
+};
+
+template <>
+struct IntChecker<true> {
+  template <typename T>
+  static bool fits_in_int(T value) {
+    return value >= INT_MIN && value <= INT_MAX;
+  }
+};
+
+const char RESET_COLOR[] = "\x1b[0m";
+
+typedef void (*FormatFunc)(fmt::Writer &, int , fmt::StringRef);
+
+void report_error(FormatFunc func,
+    int error_code, fmt::StringRef message) FMT_NOEXCEPT(true) {
+  try {
+    fmt::Writer full_message;
+    func(full_message, error_code, message); // TODO: make sure this doesn't throw
+    std::fwrite(full_message.c_str(), full_message.size(), 1, stderr);
+    std::fputc('\n', stderr);
+  } catch (...) {}
+}
+
+const Arg DUMMY_ARG = {Arg::INT, {0}};
+
+// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
+class IsZeroInt : public fmt::internal::ArgVisitor<IsZeroInt, bool> {
+ public:
+  template <typename T>
+  bool visit_any_int(T value) { return value == 0; }
+};
+
+// Parses an unsigned integer advancing s to the end of the parsed input.
+// This function assumes that the first character of s is a digit.
+template <typename Char>
+int parse_nonnegative_int(
+    const Char *&s, const char *&error) FMT_NOEXCEPT(true) {
+  assert('0' <= *s && *s <= '9');
+  unsigned value = 0;
+  do {
+    unsigned new_value = value * 10 + (*s++ - '0');
+    // Check if value wrapped around.
+    value = new_value >= value ? new_value : UINT_MAX;
+  } while ('0' <= *s && *s <= '9');
+  if (value > INT_MAX) {
+    if (!error)
+      error = "number is too big in format";
+    return 0;
+  }
+  return value;
+}
+
+template <typename Char>
+const Char *find_closing_brace(const Char *s, int num_open_braces = 1) {
+  for (int n = num_open_braces; *s; ++s) {
+    if (*s == '{') {
+      ++n;
+    } else if (*s == '}') {
+      if (--n == 0)
+        return s;
+    }
+  }
+  throw fmt::FormatError("unmatched '{' in format");
+}
+
+// Checks if an argument is a valid printf width specifier and sets
+// left alignment if it is negative.
+class WidthHandler : public fmt::internal::ArgVisitor<WidthHandler, unsigned> {
+ private:
+  fmt::FormatSpec &spec_;
+
+ public:
+  explicit WidthHandler(fmt::FormatSpec &spec) : spec_(spec) {}
+
+  unsigned visit_unhandled_arg() {
+    throw fmt::FormatError("width is not integer");
+  }
+
+  template <typename T>
+  unsigned visit_any_int(T value) {
+    typedef typename fmt::internal::IntTraits<T>::MainType UnsignedType;
+    UnsignedType width = value;
+    if (fmt::internal::is_negative(value)) {
+      spec_.align_ = fmt::ALIGN_LEFT;
+      width = 0 - width;
+    }
+    if (width > INT_MAX)
+      throw fmt::FormatError("number is too big in format");
+    return static_cast<unsigned>(width);
+  }
+};
+
+class PrecisionHandler :
+    public fmt::internal::ArgVisitor<PrecisionHandler, int> {
+ public:
+  unsigned visit_unhandled_arg() {
+    throw fmt::FormatError("precision is not integer");
+  }
+
+  template <typename T>
+  int visit_any_int(T value) {
+    if (!IntChecker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
+      throw fmt::FormatError("number is too big in format");
+    return static_cast<int>(value);
+  }
+};
+
+// Converts an integer argument to type T.
+template <typename T>
+class ArgConverter : public fmt::internal::ArgVisitor<ArgConverter<T>, void> {
+ private:
+  fmt::internal::Arg &arg_;
+  wchar_t type_;
+
+ public:
+  ArgConverter(fmt::internal::Arg &arg, wchar_t type)
+    : arg_(arg), type_(type) {}
+
+  template <typename U>
+  void visit_any_int(U value) {
+    bool is_signed = type_ == 'd' || type_ == 'i';
+    using fmt::internal::Arg;
+    if (sizeof(T) <= sizeof(int)) {
+      if (is_signed) {
+        arg_.type = Arg::INT;
+        arg_.int_value = static_cast<int>(static_cast<T>(value));
+      } else {
+        arg_.type = Arg::UINT;
+        arg_.uint_value = static_cast<unsigned>(
+            static_cast<typename fmt::internal::MakeUnsigned<T>::Type>(value));
+      }
+    } else {
+      if (is_signed) {
+        arg_.type = Arg::LONG_LONG;
+        arg_.long_long_value =
+            static_cast<typename fmt::internal::MakeUnsigned<U>::Type>(value);
+      } else {
+        arg_.type = Arg::ULONG_LONG;
+        arg_.ulong_long_value =
+            static_cast<typename fmt::internal::MakeUnsigned<U>::Type>(value);
+      }
+    }
+  }
+};
+
+// Converts an integer argument to char.
+class CharConverter : public fmt::internal::ArgVisitor<CharConverter, void> {
+ private:
+  fmt::internal::Arg &arg_;
+
+ public:
+  explicit CharConverter(fmt::internal::Arg &arg) : arg_(arg) {}
+
+  template <typename T>
+  void visit_any_int(T value) {
+    arg_.type = Arg::CHAR;
+    arg_.int_value = static_cast<char>(value);
+  }
+};
+
+// This function template is used to prevent compile errors when handling
+// incompatible string arguments, e.g. handling a wide string in a narrow
+// string formatter.
+template <typename Char>
+Arg::StringValue<Char> ignore_incompatible_str(Arg::StringValue<wchar_t>);
+
+template <>
+inline Arg::StringValue<char> ignore_incompatible_str(
+    Arg::StringValue<wchar_t>) { return Arg::StringValue<char>(); }
+
+template <>
+inline Arg::StringValue<wchar_t> ignore_incompatible_str(
+    Arg::StringValue<wchar_t> s) { return s; }
+}  // namespace
+
+void fmt::SystemError::init(
+    int error_code, StringRef format_str, const ArgList &args) {
+  error_code_ = error_code;
+  Writer w;
+  internal::format_system_error(w, error_code, format(format_str, args));
+  std::runtime_error &base = *this;
+  base = std::runtime_error(w.str());
+}
+
+template <typename T>
+int fmt::internal::CharTraits<char>::format_float(
+    char *buffer, std::size_t size, const char *format,
+    unsigned width, int precision, T value) {
+  if (width == 0) {
+    return precision < 0 ?
+        FMT_SNPRINTF(buffer, size, format, value) :
+        FMT_SNPRINTF(buffer, size, format, precision, value);
+  }
+  return precision < 0 ?
+      FMT_SNPRINTF(buffer, size, format, width, value) :
+      FMT_SNPRINTF(buffer, size, format, width, precision, value);
+}
+
+template <typename T>
+int fmt::internal::CharTraits<wchar_t>::format_float(
+    wchar_t *buffer, std::size_t size, const wchar_t *format,
+    unsigned width, int precision, T value) {
+  if (width == 0) {
+    return precision < 0 ?
+        swprintf(buffer, size, format, value) :
+        swprintf(buffer, size, format, precision, value);
+  }
+  return precision < 0 ?
+      swprintf(buffer, size, format, width, value) :
+      swprintf(buffer, size, format, width, precision, value);
+}
+
+const char fmt::internal::DIGITS[] =
+    "0001020304050607080910111213141516171819"
+    "2021222324252627282930313233343536373839"
+    "4041424344454647484950515253545556575859"
+    "6061626364656667686970717273747576777879"
+    "8081828384858687888990919293949596979899";
+
+#define FMT_POWERS_OF_10(factor) \
+  factor * 10, \
+  factor * 100, \
+  factor * 1000, \
+  factor * 10000, \
+  factor * 100000, \
+  factor * 1000000, \
+  factor * 10000000, \
+  factor * 100000000, \
+  factor * 1000000000
+
+const uint32_t fmt::internal::POWERS_OF_10_32[] = {0, FMT_POWERS_OF_10(1)};
+const uint64_t fmt::internal::POWERS_OF_10_64[] = {
+  0,
+  FMT_POWERS_OF_10(1),
+  FMT_POWERS_OF_10(ULongLong(1000000000)),
+  // Multiply several constants instead of using a single long long constant
+  // to avoid warnings about C++98 not supporting long long.
+  ULongLong(1000000000) * ULongLong(1000000000) * 10
+};
+
+void fmt::internal::report_unknown_type(char code, const char *type) {
+  if (std::isprint(static_cast<unsigned char>(code))) {
+    throw fmt::FormatError(
+        fmt::format("unknown format code '{}' for {}", code, type));
+  }
+  throw fmt::FormatError(
+      fmt::format("unknown format code '\\x{:02x}' for {}",
+        static_cast<unsigned>(code), type));
+}
+
+#ifdef _WIN32
+
+fmt::internal::UTF8ToUTF16::UTF8ToUTF16(fmt::StringRef s) {
+  int length = MultiByteToWideChar(
+      CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, 0, 0);
+  static const char ERROR[] = "cannot convert string from UTF-8 to UTF-16";
+  if (length == 0)
+    throw WindowsError(GetLastError(), ERROR);
+  buffer_.resize(length);
+  length = MultiByteToWideChar(
+    CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, &buffer_[0], length);
+  if (length == 0)
+    throw WindowsError(GetLastError(), ERROR);
+}
+
+fmt::internal::UTF16ToUTF8::UTF16ToUTF8(fmt::WStringRef s) {
+  if (int error_code = convert(s)) {
+    throw WindowsError(error_code,
+        "cannot convert string from UTF-16 to UTF-8");
+  }
+}
+
+int fmt::internal::UTF16ToUTF8::convert(fmt::WStringRef s) {
+  int length = WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, 0, 0, 0, 0);
+  if (length == 0)
+    return GetLastError();
+  buffer_.resize(length);
+  length = WideCharToMultiByte(
+    CP_UTF8, 0, s.c_str(), -1, &buffer_[0], length, 0, 0);
+  if (length == 0)
+    return GetLastError();
+  return 0;
+}
+
+void fmt::WindowsError::init(
+    int error_code, StringRef format_str, const ArgList &args) {
+  error_code_ = error_code;
+  Writer w;
+  internal::format_windows_error(w, error_code, format(format_str, args));
+  std::runtime_error &base = *this;
+  base = std::runtime_error(w.str());
+}
+
+#endif
+
+int fmt::internal::safe_strerror(
+    int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT(true) {
+  assert(buffer != 0 && buffer_size != 0);
+  int result = 0;
+#ifdef _GNU_SOURCE
+  char *message = strerror_r(error_code, buffer, buffer_size);
+  // If the buffer is full then the message is probably truncated.
+  if (message == buffer && strlen(buffer) == buffer_size - 1)
+    result = ERANGE;
+  buffer = message;
+#elif defined(__MINGW32__)
+  errno = 0;
+  (void)buffer_size;
+  buffer = strerror(error_code);
+  result = errno;
+#elif defined(_WIN32)
+  result = strerror_s(buffer, buffer_size, error_code);
+  // If the buffer is full then the message is probably truncated.
+  if (result == 0 && std::strlen(buffer) == buffer_size - 1)
+    result = ERANGE;
+#else
+  result = strerror_r(error_code, buffer, buffer_size);
+  if (result == -1)
+    result = errno;  // glibc versions before 2.13 return result in errno.
+#endif
+  return result;
+}
+
+void fmt::internal::format_system_error(
+    fmt::Writer &out, int error_code, fmt::StringRef message) {
+  Array<char, INLINE_BUFFER_SIZE> buffer;
+  buffer.resize(INLINE_BUFFER_SIZE);
+  char *system_message = 0;
+  for (;;) {
+    system_message = &buffer[0];
+    int result = safe_strerror(error_code, system_message, buffer.size());
+    if (result == 0)
+      break;
+    if (result != ERANGE) {
+      // Can't get error message, report error code instead.
+      out << message << ": error code = " << error_code;
+      return;
+    }
+    buffer.resize(buffer.size() * 2);
+  }
+  out << message << ": " << system_message;
+}
+
+#ifdef _WIN32
+void fmt::internal::format_windows_error(
+    fmt::Writer &out, int error_code, fmt::StringRef message) {
+  class String {
+   private:
+    LPWSTR str_;
+
+   public:
+    String() : str_() {}
+    ~String() { LocalFree(str_); }
+    LPWSTR *ptr() { return &str_; }
+    LPCWSTR c_str() const { return str_; }
+  };
+  String system_message;
+  if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0,
+      error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+      reinterpret_cast<LPWSTR>(system_message.ptr()), 0, 0)) {
+    UTF16ToUTF8 utf8_message;
+    if (!utf8_message.convert(system_message.c_str())) {
+      out << message << ": " << utf8_message;
+      return;
+    }
+  }
+  // Can't get error message, report error code instead.
+  out << message << ": error code = " << error_code;
+}
+#endif
+
+// An argument formatter.
+template <typename Char>
+class fmt::internal::ArgFormatter :
+    public fmt::internal::ArgVisitor<fmt::internal::ArgFormatter<Char>, void> {
+ private:
+  fmt::BasicFormatter<Char> &formatter_;
+  fmt::BasicWriter<Char> &writer_;
+  fmt::FormatSpec &spec_;
+  const Char *format_;
+
+ public:
+  ArgFormatter(
+      fmt::BasicFormatter<Char> &f,fmt::FormatSpec &s, const Char *fmt)
+  : formatter_(f), writer_(f.writer()), spec_(s), format_(fmt) {}
+
+  template <typename T>
+  void visit_any_int(T value) { writer_.write_int(value, spec_); }
+
+  template <typename T>
+  void visit_any_double(T value) { writer_.write_double(value, spec_); }
+
+  void visit_char(int value) {
+    if (spec_.type_ && spec_.type_ != 'c') {
+      spec_.flags_ |= CHAR_FLAG;
+      writer_.write_int(value, spec_);
+      return;
+    }
+    if (spec_.align_ == ALIGN_NUMERIC || spec_.flags_ != 0)
+      throw FormatError("invalid format specifier for char");
+    typedef typename fmt::BasicWriter<Char>::CharPtr CharPtr;
+    CharPtr out = CharPtr();
+    if (spec_.width_ > 1) {
+      Char fill = static_cast<Char>(spec_.fill());
+      out = writer_.grow_buffer(spec_.width_);
+      if (spec_.align_ == fmt::ALIGN_RIGHT) {
+        std::fill_n(out, spec_.width_ - 1, fill);
+        out += spec_.width_ - 1;
+      } else if (spec_.align_ == fmt::ALIGN_CENTER) {
+        out = writer_.fill_padding(out, spec_.width_, 1, fill);
+      } else {
+        std::fill_n(out + 1, spec_.width_ - 1, fill);
+      }
+    } else {
+      out = writer_.grow_buffer(1);
+    }
+    *out = static_cast<Char>(value);
+  }
+
+  void visit_string(Arg::StringValue<char> value) {
+    writer_.write_str(value, spec_);
+  }
+  void visit_wstring(Arg::StringValue<wchar_t> value) {
+    writer_.write_str(ignore_incompatible_str<Char>(value), spec_);
+  }
+
+  void visit_pointer(const void *value) {
+    if (spec_.type_ && spec_.type_ != 'p')
+      fmt::internal::report_unknown_type(spec_.type_, "pointer");
+    spec_.flags_ = fmt::HASH_FLAG;
+    spec_.type_ = 'x';
+    writer_.write_int(reinterpret_cast<uintptr_t>(value), spec_);
+  }
+
+  void visit_custom(Arg::CustomValue c) {
+    c.format(&formatter_, c.value, format_);
+  }
+};
+
+template <typename Char>
+void fmt::internal::FormatErrorReporter<Char>::operator()(
+        const Char *s, fmt::StringRef message) const {
+  if (find_closing_brace(s, num_open_braces))
+    throw fmt::FormatError(message);
+}
+
+// Fills the padding around the content and returns the pointer to the
+// content area.
+template <typename Char>
+typename fmt::BasicWriter<Char>::CharPtr
+  fmt::BasicWriter<Char>::fill_padding(CharPtr buffer,
+    unsigned total_size, std::size_t content_size, wchar_t fill) {
+  std::size_t padding = total_size - content_size;
+  std::size_t left_padding = padding / 2;
+  Char fill_char = static_cast<Char>(fill);
+  std::fill_n(buffer, left_padding, fill_char);
+  buffer += left_padding;
+  CharPtr content = buffer;
+  std::fill_n(buffer + content_size, padding - left_padding, fill_char);
+  return content;
+}
+
+template <typename Char>
+template <typename T>
+void fmt::BasicWriter<Char>::write_double(T value, const FormatSpec &spec) {
+  // Check type.
+  char type = spec.type();
+  bool upper = false;
+  switch (type) {
+  case 0:
+    type = 'g';
+    break;
+  case 'e': case 'f': case 'g': case 'a':
+    break;
+  case 'F':
+#ifdef _MSC_VER
+    // MSVC's printf doesn't support 'F'.
+    type = 'f';
+#endif
+    // Fall through.
+  case 'E': case 'G': case 'A':
+    upper = true;
+    break;
+  default:
+    internal::report_unknown_type(type, "double");
+    break;
+  }
+
+  char sign = 0;
+  // Use getsign instead of value < 0 because the latter is always
+  // false for NaN.
+  if (getsign(static_cast<double>(value))) {
+    sign = '-';
+    value = -value;
+  } else if (spec.flag(SIGN_FLAG)) {
+    sign = spec.flag(PLUS_FLAG) ? '+' : ' ';
+  }
+
+  if (value != value) {
+    // Format NaN ourselves because sprintf's output is not consistent
+    // across platforms.
+    std::size_t size = 4;
+    const char *nan = upper ? " NAN" : " nan";
+    if (!sign) {
+      --size;
+      ++nan;
+    }
+    CharPtr out = write_str(nan, size, spec);
+    if (sign)
+      *out = sign;
+    return;
+  }
+
+  if (isinfinity(value)) {
+    // Format infinity ourselves because sprintf's output is not consistent
+    // across platforms.
+    std::size_t size = 4;
+    const char *inf = upper ? " INF" : " inf";
+    if (!sign) {
+      --size;
+      ++inf;
+    }
+    CharPtr out = write_str(inf, size, spec);
+    if (sign)
+      *out = sign;
+    return;
+  }
+
+  std::size_t offset = buffer_.size();
+  unsigned width = spec.width();
+  if (sign) {
+    buffer_.reserve(buffer_.size() + (std::max)(width, 1u));
+    if (width > 0)
+      --width;
+    ++offset;
+  }
+
+  // Build format string.
+  enum { MAX_FORMAT_SIZE = 10}; // longest format: %#-*.*Lg
+  Char format[MAX_FORMAT_SIZE];
+  Char *format_ptr = format;
+  *format_ptr++ = '%';
+  unsigned width_for_sprintf = width;
+  if (spec.flag(HASH_FLAG))
+    *format_ptr++ = '#';
+  if (spec.align() == ALIGN_CENTER) {
+    width_for_sprintf = 0;
+  } else {
+    if (spec.align() == ALIGN_LEFT)
+      *format_ptr++ = '-';
+    if (width != 0)
+      *format_ptr++ = '*';
+  }
+  if (spec.precision() >= 0) {
+    *format_ptr++ = '.';
+    *format_ptr++ = '*';
+  }
+  if (IsLongDouble<T>::VALUE)
+    *format_ptr++ = 'L';
+  *format_ptr++ = type;
+  *format_ptr = '\0';
+
+  // Format using snprintf.
+  Char fill = static_cast<Char>(spec.fill());
+  for (;;) {
+    std::size_t size = buffer_.capacity() - offset;
+#ifdef _MSC_VER
+    // MSVC's vsnprintf_s doesn't work with zero size, so reserve
+    // space for at least one extra character to make the size non-zero.
+    // Note that the buffer's capacity will increase by more than 1.
+    if (size == 0) {
+      buffer_.reserve(offset + 1);
+      size = buffer_.capacity() - offset;
+    }
+#endif
+    Char *start = &buffer_[offset];
+    int n = internal::CharTraits<Char>::format_float(
+        start, size, format, width_for_sprintf, spec.precision(), value);
+    if (n >= 0 && offset + n < buffer_.capacity()) {
+      if (sign) {
+        if ((spec.align() != ALIGN_RIGHT && spec.align() != ALIGN_DEFAULT) ||
+            *start != ' ') {
+          *(start - 1) = sign;
+          sign = 0;
+        } else {
+          *(start - 1) = fill;
+        }
+        ++n;
+      }
+      if (spec.align() == ALIGN_CENTER &&
+          spec.width() > static_cast<unsigned>(n)) {
+        unsigned width = spec.width();
+        CharPtr p = grow_buffer(width);
+        std::copy(p, p + n, p + (width - n) / 2);
+        fill_padding(p, spec.width(), n, fill);
+        return;
+      }
+      if (spec.fill() != ' ' || sign) {
+        while (*start == ' ')
+          *start++ = fill;
+        if (sign)
+          *(start - 1) = sign;
+      }
+      grow_buffer(n);
+      return;
+    }
+    // If n is negative we ask to increase the capacity by at least 1,
+    // but as std::vector, the buffer grows exponentially.
+    buffer_.reserve(n >= 0 ? offset + n + 1 : buffer_.capacity() + 1);
+  }
+}
+
+template <typename Char>
+template <typename StrChar>
+void fmt::BasicWriter<Char>::write_str(
+    const Arg::StringValue<StrChar> &str, const FormatSpec &spec) {
+  // Check if StrChar is convertible to Char.
+  internal::CharTraits<Char>::convert(StrChar());
+  if (spec.type_ && spec.type_ != 's')
+    internal::report_unknown_type(spec.type_, "string");
+  const StrChar *s = str.value;
+  std::size_t size = str.size;
+  if (size == 0) {
+    if (!s) {
+      Char err[] = { '(', 'n', 'u', 'l', 'l', ')', 0 };
+      write_str(err, 6, spec);
+      return;
+    }
+    if (*s)
+      size = std::char_traits<StrChar>::length(s);
+  }
+  write_str(s, size, spec);
+}
+
+template <typename Char>
+inline const Arg
+    &fmt::BasicFormatter<Char>::parse_arg_index(const Char *&s) {
+  unsigned arg_index = 0;
+  if (*s < '0' || *s > '9') {
+    if (*s != '}' && *s != ':')
+      report_error_(s, "invalid argument index in format string");
+    const Arg &arg = next_arg();
+    if (error_)
+      report_error_(s, error_);
+    return arg;
+  }
+  if (next_arg_index_ > 0) {
+    report_error_(s,
+        "cannot switch from automatic to manual argument indexing");
+  }
+  next_arg_index_ = -1;
+  arg_index = parse_nonnegative_int(s, error_);
+  if (error_)
+    report_error_(s, error_); // TODO: don't use report_error_
+  if (arg_index >= args_.size())
+    report_error_(s, "argument index is out of range in format");
+  return args_[arg_index];
+}
+
+template <typename Char>
+void fmt::BasicFormatter<Char>::check_sign(
+    const Char *&s, const Arg &arg) {
+  char sign = static_cast<char>(*s);
+  if (arg.type > Arg::LAST_NUMERIC_TYPE) {
+    report_error_(s, fmt::format(
+      "format specifier '{}' requires numeric argument", sign).c_str());
+  }
+  if (arg.type == Arg::UINT || arg.type == Arg::ULONG_LONG) {
+    report_error_(s, fmt::format(
+      "format specifier '{}' requires signed argument", sign).c_str());
+  }
+  ++s;
+}
+
+const Arg &fmt::internal::FormatterBase::next_arg() {
+  if (next_arg_index_ < 0) {
+    if (!error_)
+      error_ = "cannot switch from manual to automatic argument indexing";
+    return DUMMY_ARG;
+  }
+  unsigned arg_index = next_arg_index_++;
+  if (arg_index < args_.size())
+    return args_[arg_index];
+  if (!error_)
+    error_ = "argument index is out of range in format";
+  return DUMMY_ARG;
+}
+
+const Arg &fmt::internal::FormatterBase::handle_arg_index(unsigned arg_index) {
+  if (arg_index != UINT_MAX) {
+    if (next_arg_index_ <= 0) {
+      next_arg_index_ = -1;
+      --arg_index;
+    } else if (!error_) {
+      error_ = "cannot switch from automatic to manual argument indexing";
+    }
+    if (arg_index < args_.size())
+      return args_[arg_index];
+    if (!error_)
+      error_ = "argument index is out of range in format";
+    return DUMMY_ARG;
+  }
+  return next_arg();
+}
+
+template <typename Char>
+void fmt::internal::PrintfFormatter<Char>::parse_flags(
+    FormatSpec &spec, const Char *&s) {
+  for (;;) {
+    switch (*s++) {
+      case '-':
+        spec.align_ = ALIGN_LEFT;
+        break;
+      case '+':
+        spec.flags_ |= SIGN_FLAG | PLUS_FLAG;
+        break;
+      case '0':
+        spec.fill_ = '0';
+        break;
+      case ' ':
+        spec.flags_ |= SIGN_FLAG;
+        break;
+      case '#':
+        spec.flags_ |= HASH_FLAG;
+        break;
+      default:
+        --s;
+        return;
+    }
+  }
+}
+
+template <typename Char>
+unsigned fmt::internal::PrintfFormatter<Char>::parse_header(
+  const Char *&s, FormatSpec &spec) {
+  unsigned arg_index = UINT_MAX;
+  Char c = *s;
+  if (c >= '0' && c <= '9') {
+    // Parse an argument index (if followed by '$') or a width possibly
+    // preceded with '0' flag(s).
+    unsigned value = parse_nonnegative_int(s, error_);
+    if (*s == '$') {  // value is an argument index
+      ++s;
+      arg_index = value;
+    } else {
+      if (c == '0')
+        spec.fill_ = '0';
+      if (value != 0) {
+        // Nonzero value means that we parsed width and don't need to
+        // parse it or flags again, so return now.
+        spec.width_ = value;
+        return arg_index;
+      }
+    }
+  }
+  parse_flags(spec, s);
+  // Parse width.
+  if (*s >= '0' && *s <= '9') {
+    spec.width_ = parse_nonnegative_int(s, error_);
+  } else if (*s == '*') {
+    ++s;
+    spec.width_ = WidthHandler(spec).visit(handle_arg_index(UINT_MAX));
+  }
+  return arg_index;
+}
+
+template <typename Char>
+void fmt::internal::PrintfFormatter<Char>::format(
+    BasicWriter<Char> &writer, BasicStringRef<Char> format,
+    const ArgList &args) {
+  const Char *start = format.c_str();
+  args_ = args;
+  next_arg_index_ = 0;
+  const Char *s = start;
+  while (*s) {
+    Char c = *s++;
+    if (c != '%') continue;
+    if (*s == c) {
+      write(writer, start, s);
+      start = ++s;
+      continue;
+    }
+    write(writer, start, s - 1);
+
+    FormatSpec spec;
+    spec.align_ = ALIGN_RIGHT;
+
+    // Reporting errors is delayed till the format specification is
+    // completely parsed. This is done to avoid potentially confusing
+    // error messages for incomplete format strings. For example, in
+    //   sprintf("%2$", 42);
+    // the format specification is incomplete. In a naive approach we
+    // would parse 2 as an argument index and report an error that the
+    // index is out of range which would be rather confusing if the
+    // use meant "%2d$" rather than "%2$d". If we delay an error, the
+    // user will get an error that the format string is invalid which
+    // is OK for both cases.
+
+    // Parse argument index, flags and width.
+    unsigned arg_index = parse_header(s, spec);
+
+    // Parse precision.
+    if (*s == '.') {
+      ++s;
+      if ('0' <= *s && *s <= '9') {
+        spec.precision_ = parse_nonnegative_int(s, error_);
+      } else if (*s == '*') {
+        ++s;
+        spec.precision_ = PrecisionHandler().visit(handle_arg_index(UINT_MAX));
+      }
+    }
+
+    Arg arg = handle_arg_index(arg_index);
+    if (spec.flag(HASH_FLAG) && IsZeroInt().visit(arg))
+      spec.flags_ &= ~HASH_FLAG;
+    if (spec.fill_ == '0') {
+      if (arg.type <= Arg::LAST_NUMERIC_TYPE)
+        spec.align_ = ALIGN_NUMERIC;
+      else
+        spec.fill_ = ' ';  // Ignore '0' flag for non-numeric types.
+    }
+
+    // Parse length and convert the argument to the required type.
+    switch (*s++) {
+    case 'h':
+      if (*s == 'h')
+        ArgConverter<signed char>(arg, *++s).visit(arg);
+      else
+        ArgConverter<short>(arg, *s).visit(arg);
+      break;
+    case 'l':
+      if (*s == 'l')
+        ArgConverter<fmt::LongLong>(arg, *++s).visit(arg);
+      else
+        ArgConverter<long>(arg, *s).visit(arg);
+      break;
+    case 'j':
+      ArgConverter<intmax_t>(arg, *s).visit(arg);
+      break;
+    case 'z':
+      ArgConverter<size_t>(arg, *s).visit(arg);
+      break;
+    case 't':
+      ArgConverter<ptrdiff_t>(arg, *s).visit(arg);
+      break;
+    case 'L':
+      // printf produces garbage when 'L' is omitted for long double, no
+      // need to do the same.
+      break;
+    default:
+      --s;
+      ArgConverter<int>(arg, *s).visit(arg);
+    }
+
+    // Parse type.
+    if (!*s)
+      throw FormatError("invalid format string");
+    if (error_)
+      throw FormatError(error_);
+    spec.type_ = static_cast<char>(*s++);
+    if (arg.type <= Arg::LAST_INTEGER_TYPE) {
+      // Normalize type.
+      switch (spec.type_) {
+      case 'i': case 'u':
+        spec.type_ = 'd';
+        break;
+      case 'c':
+        // TODO: handle wchar_t
+        CharConverter(arg).visit(arg);
+        break;
+      }
+    }
+
+    start = s;
+
+    // Format argument.
+    switch (arg.type) {
+    case Arg::INT:
+      writer.write_int(arg.int_value, spec);
+      break;
+    case Arg::UINT:
+      writer.write_int(arg.uint_value, spec);
+      break;
+    case Arg::LONG_LONG:
+      writer.write_int(arg.long_long_value, spec);
+      break;
+    case Arg::ULONG_LONG:
+      writer.write_int(arg.ulong_long_value, spec);
+      break;
+    case Arg::CHAR: {
+      if (spec.type_ && spec.type_ != 'c')
+        writer.write_int(arg.int_value, spec);
+      typedef typename BasicWriter<Char>::CharPtr CharPtr;
+      CharPtr out = CharPtr();
+      if (spec.width_ > 1) {
+        Char fill = ' ';
+        out = writer.grow_buffer(spec.width_);
+        if (spec.align_ != ALIGN_LEFT) {
+          std::fill_n(out, spec.width_ - 1, fill);
+          out += spec.width_ - 1;
+        } else {
+          std::fill_n(out + 1, spec.width_ - 1, fill);
+        }
+      } else {
+        out = writer.grow_buffer(1);
+      }
+      *out = static_cast<Char>(arg.int_value);
+      break;
+    }
+    case Arg::DOUBLE:
+      writer.write_double(arg.double_value, spec);
+      break;
+    case Arg::LONG_DOUBLE:
+      writer.write_double(arg.long_double_value, spec);
+      break;
+    case Arg::STRING:
+      writer.write_str(arg.string, spec);
+      break;
+    case Arg::WSTRING:
+      writer.write_str(ignore_incompatible_str<Char>(arg.wstring), spec);
+      break;
+    case Arg::POINTER:
+      if (spec.type_ && spec.type_ != 'p')
+        internal::report_unknown_type(spec.type_, "pointer");
+      spec.flags_= HASH_FLAG;
+      spec.type_ = 'x';
+      writer.write_int(reinterpret_cast<uintptr_t>(arg.pointer_value), spec);
+      break;
+    case Arg::CUSTOM:
+      if (spec.type_)
+        internal::report_unknown_type(spec.type_, "object");
+      arg.custom.format(&writer, arg.custom.value, "s");
+      break;
+    default:
+      assert(false);
+      break;
+    }
+  }
+  write(writer, start, s);
+}
+
+template <typename Char>
+const Char *fmt::BasicFormatter<Char>::format(
+    const Char *format_str, const Arg &arg) {
+  const Char *s = format_str;
+  const char *error = 0;
+  FormatSpec spec;
+  if (*s == ':') {
+    if (arg.type == Arg::CUSTOM) {
+      arg.custom.format(this, arg.custom.value, s);
+      return find_closing_brace(s) + 1;
+    }
+    ++s;
+    // Parse fill and alignment.
+    if (Char c = *s) {
+      const Char *p = s + 1;
+      spec.align_ = ALIGN_DEFAULT;
+      do {
+        switch (*p) {
+          case '<':
+            spec.align_ = ALIGN_LEFT;
+            break;
+          case '>':
+            spec.align_ = ALIGN_RIGHT;
+            break;
+          case '=':
+            spec.align_ = ALIGN_NUMERIC;
+            break;
+          case '^':
+            spec.align_ = ALIGN_CENTER;
+            break;
+        }
+        if (spec.align_ != ALIGN_DEFAULT) {
+          if (p != s) {
+            if (c == '}') break;
+            if (c == '{')
+              report_error_(s, "invalid fill character '{'");
+            s += 2;
+            spec.fill_ = c;
+          } else ++s;
+          if (spec.align_ == ALIGN_NUMERIC && arg.type > Arg::LAST_NUMERIC_TYPE)
+            report_error_(s, "format specifier '=' requires numeric argument");
+          break;
+        }
+      } while (--p >= s);
+    }
+
+    // Parse sign.
+    switch (*s) {
+      case '+':
+        check_sign(s, arg);
+        spec.flags_ |= SIGN_FLAG | PLUS_FLAG;
+        break;
+      case '-':
+        check_sign(s, arg);
+        spec.flags_ |= MINUS_FLAG;
+        break;
+      case ' ':
+        check_sign(s, arg);
+        spec.flags_ |= SIGN_FLAG;
+        break;
+    }
+
+    if (*s == '#') {
+      if (arg.type > Arg::LAST_NUMERIC_TYPE)
+        report_error_(s, "format specifier '#' requires numeric argument");
+      spec.flags_ |= HASH_FLAG;
+      ++s;
+    }
+
+    // Parse width and zero flag.
+    if ('0' <= *s && *s <= '9') {
+      if (*s == '0') {
+        if (arg.type > Arg::LAST_NUMERIC_TYPE)
+          report_error_(s, "format specifier '0' requires numeric argument");
+        spec.align_ = ALIGN_NUMERIC;
+        spec.fill_ = '0';
+      }
+      // Zero may be parsed again as a part of the width, but it is simpler
+      // and more efficient than checking if the next char is a digit.
+      spec.width_ = parse_nonnegative_int(s, error);
+      if (error)
+        report_error_(s, error);
+    }
+
+    // Parse precision.
+    if (*s == '.') {
+      ++s;
+      spec.precision_ = 0;
+      if ('0' <= *s && *s <= '9') {
+        spec.precision_ = parse_nonnegative_int(s, error);
+        if (error)
+          report_error_(s, error);
+      } else if (*s == '{') {
+        ++s;
+        ++report_error_.num_open_braces;
+        const Arg &precision_arg = parse_arg_index(s);
+        ULongLong value = 0;
+        switch (precision_arg.type) {
+          case Arg::INT:
+            if (precision_arg.int_value < 0)
+              report_error_(s, "negative precision in format");
+            value = precision_arg.int_value;
+            break;
+          case Arg::UINT:
+            value = precision_arg.uint_value;
+            break;
+          case Arg::LONG_LONG:
+            if (precision_arg.long_long_value < 0)
+              report_error_(s, "negative precision in format");
+            value = precision_arg.long_long_value;
+            break;
+          case Arg::ULONG_LONG:
+            value = precision_arg.ulong_long_value;
+            break;
+          default:
+            report_error_(s, "precision is not integer");
+        }
+        if (value > INT_MAX)
+          report_error_(s, "number is too big in format");
+        spec.precision_ = static_cast<int>(value);
+        if (*s++ != '}')
+          throw FormatError("unmatched '{' in format");
+        --report_error_.num_open_braces;
+      } else {
+        report_error_(s, "missing precision in format");
+      }
+      if (arg.type != Arg::DOUBLE && arg.type != Arg::LONG_DOUBLE) {
+        report_error_(s,
+            "precision specifier requires floating-point argument");
+      }
+    }
+
+    // Parse type.
+    if (*s != '}' && *s)
+      spec.type_ = static_cast<char>(*s++);
+  }
+
+  if (*s++ != '}')
+    throw FormatError("unmatched '{' in format");
+  start_ = s;
+
+  // Format argument.
+  internal::ArgFormatter<Char>(*this, spec, s - 1).visit(arg);
+  return s;
+}
+
+template <typename Char>
+void fmt::BasicFormatter<Char>::format(
+    BasicStringRef<Char> format_str, const ArgList &args) {
+  const Char *s = start_ = format_str.c_str();
+  args_ = args;
+  next_arg_index_ = 0;
+  while (*s) {
+    Char c = *s++;
+    if (c != '{' && c != '}') continue;
+    if (*s == c) {
+      write(writer_, start_, s);
+      start_ = ++s;
+      continue;
+    }
+    if (c == '}')
+      throw FormatError("unmatched '}' in format");
+    report_error_.num_open_braces = 1;
+    write(writer_, start_, s - 1);
+    Arg arg = parse_arg_index(s);
+    s = format(s, arg);
+  }
+  write(writer_, start_, s);
+}
+
+void fmt::report_system_error(
+    int error_code, fmt::StringRef message) FMT_NOEXCEPT(true) {
+  // FIXME: format_system_error may throw
+  report_error(internal::format_system_error, error_code, message);
+}
+
+#ifdef _WIN32
+void fmt::report_windows_error(
+    int error_code, fmt::StringRef message) FMT_NOEXCEPT(true) {
+  // FIXME: format_windows_error may throw
+  report_error(internal::format_windows_error, error_code, message);
+}
+#endif
+
+void fmt::print(std::FILE *f, StringRef format_str, const ArgList &args) {
+  Writer w;
+  w.write(format_str, args);
+  std::fwrite(w.data(), 1, w.size(), f);
+}
+
+void fmt::print(std::ostream &os, StringRef format_str, const ArgList &args) {
+  Writer w;
+  w.write(format_str, args);
+  os.write(w.data(), w.size());
+}
+
+void fmt::print_colored(Color c, StringRef format, const ArgList &args) {
+  char escape[] = "\x1b[30m";
+  escape[3] = '0' + static_cast<char>(c);
+  std::fputs(escape, stdout);
+  print(format, args);
+  std::fputs(RESET_COLOR, stdout);
+}
+
+int fmt::fprintf(std::FILE *f, StringRef format, const ArgList &args) {
+  Writer w;
+  printf(w, format, args);
+  return std::fwrite(w.data(), 1, w.size(), f);
+}
+
+// Explicit instantiations for char.
+
+template fmt::BasicWriter<char>::CharPtr
+  fmt::BasicWriter<char>::fill_padding(CharPtr buffer,
+    unsigned total_size, std::size_t content_size, wchar_t fill);
+
+template void fmt::BasicFormatter<char>::format(
+  BasicStringRef<char> format, const ArgList &args);
+
+template void fmt::internal::PrintfFormatter<char>::format(
+  BasicWriter<char> &writer, BasicStringRef<char> format, const ArgList &args);
+
+// Explicit instantiations for wchar_t.
+
+template fmt::BasicWriter<wchar_t>::CharPtr
+  fmt::BasicWriter<wchar_t>::fill_padding(CharPtr buffer,
+    unsigned total_size, std::size_t content_size, wchar_t fill);
+
+template void fmt::BasicFormatter<wchar_t>::format(
+    BasicStringRef<wchar_t> format, const ArgList &args);
+
+template void fmt::internal::PrintfFormatter<wchar_t>::format(
+    BasicWriter<wchar_t> &writer, BasicStringRef<wchar_t> format,
+    const ArgList &args);
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif

new file source/third_party/cppformat/format.h

@@ +1 @@
+/*
+ * Slightly modified version of cppformat, by Wildfire Games, for 0 A.D.
+ * Based on cppformat v0.11.0 from https://github.com/cppformat/cppformat
+ */
+
+/*
+ Formatting library for C++
+
+ Copyright (c) 2012 - 2014, Victor Zverovich
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FMT_FORMAT_H_
+#define FMT_FORMAT_H_
+
+#include <stdint.h>
+
+#include <cassert>
+#include <cstddef>  // for std::ptrdiff_t
+#include <cstdio>
+#include <algorithm>
+#include <limits>
+#include <stdexcept>
+#include <string>
+#include <sstream>
+
+#if defined(_SECURE_SCL) && _SECURE_SCL
+# include <iterator>
+#endif
+
+#ifdef __GNUC__
+# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+# define FMT_GCC_EXTENSION __extension__
+// Disable warning about "long long" which is sometimes reported even
+// when using __extension__.
+# if FMT_GCC_VERSION >= 406
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+#else
+# define FMT_GCC_EXTENSION
+#endif
+
+#ifdef __GNUC_LIBSTD__
+# define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__)
+#endif
+
+#ifdef __has_feature
+# define FMT_HAS_FEATURE(x) __has_feature(x)
+#else
+# define FMT_HAS_FEATURE(x) 0
+#endif
+
+#ifdef __has_builtin
+# define FMT_HAS_BUILTIN(x) __has_builtin(x)
+#else
+# define FMT_HAS_BUILTIN(x) 0
+#endif
+
+#ifndef FMT_USE_VARIADIC_TEMPLATES
+// Variadic templates are available in GCC since version 4.4
+// (http://gcc.gnu.org/projects/cxx0x.html) and in Visual C++
+// since version 2013.
+# define FMT_USE_VARIADIC_TEMPLATES \
+   (FMT_HAS_FEATURE(cxx_variadic_templates) || \
+       (FMT_GCC_VERSION >= 404 && __cplusplus >= 201103) || (defined(_MSC_VER) && _MSC_VER >= 1800))
+#endif
+
+#ifndef FMT_USE_RVALUE_REFERENCES
+// Don't use rvalue references when compiling with clang and an old libstdc++
+// as the latter doesn't provide std::move.
+# if defined(FMT_GNUC_LIBSTD_VERSION) && FMT_GNUC_LIBSTD_VERSION <= 402
+#  define FMT_USE_RVALUE_REFERENCES 0
+# else
+#  define FMT_USE_RVALUE_REFERENCES \
+    (FMT_HAS_FEATURE(cxx_rvalue_references) || \
+        (FMT_GCC_VERSION >= 403 && __cplusplus >= 201103) || (defined(_MSC_VER) && _MSC_VER >= 1600))
+# endif
+#endif
+
+#if FMT_USE_RVALUE_REFERENCES
+# include <utility>  // for std::move
+#endif
+
+// Define FMT_USE_NOEXCEPT to make C++ Format use noexcept (C++11 feature).
+#if (defined(FMT_USE_NOEXPECT) && FMT_USE_NOEXCEPT) || FMT_HAS_FEATURE(cxx_noexcept) || \
+  (FMT_GCC_VERSION >= 408 && __cplusplus >= 201103)
+# define FMT_NOEXCEPT(expr) noexcept(expr)
+#else
+# define FMT_NOEXCEPT(expr)
+#endif
+
+// A macro to disallow the copy constructor and operator= functions
+// This should be used in the private: declarations for a class
+#define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&); \
+  void operator=(const TypeName&)
+
+namespace fmt {
+
+// Fix the warning about long long on older versions of GCC
+// that don't support the diagnostic pragma.
+FMT_GCC_EXTENSION typedef long long LongLong;
+FMT_GCC_EXTENSION typedef unsigned long long ULongLong;
+
+#if FMT_USE_RVALUE_REFERENCES
+using std::move;
+#endif
+
+template <typename Char>
+class BasicWriter;
+
+typedef BasicWriter<char> Writer;
+typedef BasicWriter<wchar_t> WWriter;
+
+template <typename Char>
+class BasicFormatter;
+
+template <typename Char, typename T>
+void format(BasicFormatter<Char> &f, const Char *format_str, const T &value);
+
+/**
+  \rst
+  A string reference. It can be constructed from a C string or
+  ``std::string``.
+  
+  You can use one of the following typedefs for common character types:
+
+  +------------+-------------------------+
+  | Type       | Definition              |
+  +============+=========================+
+  | StringRef  | BasicStringRef<char>    |
+  +------------+-------------------------+
+  | WStringRef | BasicStringRef<wchar_t> |
+  +------------+-------------------------+
+
+  This class is most useful as a parameter type to allow passing
+  different types of strings to a function, for example::
+
+    template<typename... Args>
+    std::string format(StringRef format, const Args & ... args);
+
+    format("{}", 42);
+    format(std::string("{}"), 42);
+  \endrst
+ */
+template <typename Char>
+class BasicStringRef {
+ private:
+  const Char *data_;
+  mutable std::size_t size_;
+
+ public:
+  /**
+    Constructs a string reference object from a C string and a size.
+    If *size* is zero, which is the default, the size is computed
+    automatically.
+   */
+  BasicStringRef(const Char *s, std::size_t size = 0) : data_(s), size_(size) {}
+
+  /**
+    Constructs a string reference from an `std::string` object.
+   */
+  BasicStringRef(const std::basic_string<Char> &s)
+  : data_(s.c_str()), size_(s.size()) {}
+
+  /**
+    Converts a string reference to an `std::string` object.
+   */
+  operator std::basic_string<Char>() const {
+    return std::basic_string<Char>(data_, size());
+  }
+
+  /**
+    Returns the pointer to a C string.
+   */
+  const Char *c_str() const { return data_; }
+
+  /**
+    Returns the string size.
+   */
+  std::size_t size() const {
+    if (size_ == 0 && data_) size_ = std::char_traits<Char>::length(data_);
+    return size_;
+  }
+
+  friend bool operator==(BasicStringRef lhs, BasicStringRef rhs) {
+    return lhs.data_ == rhs.data_;
+  }
+  friend bool operator!=(BasicStringRef lhs, BasicStringRef rhs) {
+    return lhs.data_ != rhs.data_;
+  }
+};
+
+typedef BasicStringRef<char> StringRef;
+typedef BasicStringRef<wchar_t> WStringRef;
+
+/**
+  A formatting error such as invalid format string.
+*/
+class FormatError : public std::runtime_error {
+public:
+  explicit FormatError(const std::string &message)
+  : std::runtime_error(message) {}
+};
+
+namespace internal {
+
+// The number of characters to store in the Array object, representing the
+// output buffer, itself to avoid dynamic memory allocation.
+enum { INLINE_BUFFER_SIZE = 500 };
+
+#if defined(_SECURE_SCL) && _SECURE_SCL
+// Use checked iterator to avoid warnings on MSVC.
+template <typename T>
+inline stdext::checked_array_iterator<T*> make_ptr(T *ptr, std::size_t size) {
+  return stdext::checked_array_iterator<T*>(ptr, size);
+}
+#else
+template <typename T>
+inline T *make_ptr(T *ptr, std::size_t) { return ptr; }
+#endif
+
+// A simple array for POD types with the first SIZE elements stored in
+// the object itself. It supports a subset of std::vector's operations.
+template <typename T, std::size_t SIZE>
+class Array {
+ private:
+  std::size_t size_;
+  std::size_t capacity_;
+  T *ptr_;
+  T data_[SIZE];
+
+  void grow(std::size_t size);
+
+  // Free memory allocated by the array.
+  void free() {
+    if (ptr_ != data_) delete [] ptr_;
+  }
+
+  // Move data from other to this array.
+  void move(Array &other) {
+    size_ = other.size_;
+    capacity_ = other.capacity_;
+    if (other.ptr_ == other.data_) {
+      ptr_ = data_;
+      std::copy(other.data_, other.data_ + size_, make_ptr(data_, capacity_));
+    } else {
+      ptr_ = other.ptr_;
+      // Set pointer to the inline array so that delete is not called
+      // when freeing.
+      other.ptr_ = other.data_;
+    }
+  }
+
+  FMT_DISALLOW_COPY_AND_ASSIGN(Array);
+
+ public:
+  explicit Array(std::size_t size = 0)
+    : size_(size), capacity_(SIZE), ptr_(data_) {}
+  ~Array() { free(); }
+
+#if FMT_USE_RVALUE_REFERENCES
+  Array(Array &&other) {
+    move(other);
+  }
+
+  Array& operator=(Array &&other) {
+    assert(this != &other);
+    free();
+    move(other);
+    return *this;
+  }
+#endif
+
+  // Returns the size of this array.
+  std::size_t size() const { return size_; }
+
+  // Returns the capacity of this array.
+  std::size_t capacity() const { return capacity_; }
+
+  // Resizes the array. If T is a POD type new elements are not initialized.
+  void resize(std::size_t new_size) {
+    if (new_size > capacity_)
+      grow(new_size);
+    size_ = new_size;
+  }
+
+  // Reserves space to store at least capacity elements.
+  void reserve(std::size_t capacity) {
+    if (capacity > capacity_)
+      grow(capacity);
+  }
+
+  void clear() { size_ = 0; }
+
+  void push_back(const T &value) {
+    if (size_ == capacity_)
+      grow(size_ + 1);
+    ptr_[size_++] = value;
+  }
+
+  // Appends data to the end of the array.
+  void append(const T *begin, const T *end);
+
+  T &operator[](std::size_t index) { return ptr_[index]; }
+  const T &operator[](std::size_t index) const { return ptr_[index]; }
+};
+
+template <typename T, std::size_t SIZE>
+void Array<T, SIZE>::grow(std::size_t size) {
+  capacity_ = (std::max)(size, capacity_ + capacity_ / 2);
+  T *p = new T[capacity_];
+  std::copy(ptr_, ptr_ + size_, make_ptr(p, capacity_));
+  if (ptr_ != data_)
+    delete [] ptr_;
+  ptr_ = p;
+}
+
+template <typename T, std::size_t SIZE>
+void Array<T, SIZE>::append(const T *begin, const T *end) {
+  std::ptrdiff_t num_elements = end - begin;
+  if (size_ + num_elements > capacity_)
+    grow(size_ + num_elements);
+  std::copy(begin, end, make_ptr(ptr_, capacity_) + size_);
+  size_ += num_elements;
+}
+
+template <typename Char>
+class BasicCharTraits {
+ public:
+#if defined(_SECURE_SCL) && _SECURE_SCL
+  typedef stdext::checked_array_iterator<Char*> CharPtr;
+#else
+  typedef Char *CharPtr;
+#endif
+};
+
+template <typename Char>
+class CharTraits;
+
+template <>
+class CharTraits<char> : public BasicCharTraits<char> {
+ private:
+  // Conversion from wchar_t to char is not allowed.
+  static char convert(wchar_t);
+
+public:
+  typedef const wchar_t *UnsupportedStrType;
+
+  static char convert(char value) { return value; }
+
+  // Formats a floating-point number.
+  template <typename T>
+  static int format_float(char *buffer, std::size_t size,
+      const char *format, unsigned width, int precision, T value);
+};
+
+template <>
+class CharTraits<wchar_t> : public BasicCharTraits<wchar_t> {
+ public:
+  typedef const char *UnsupportedStrType;
+
+  static wchar_t convert(char value) { return value; }
+  static wchar_t convert(wchar_t value) { return value; }
+
+  template <typename T>
+  static int format_float(wchar_t *buffer, std::size_t size,
+      const wchar_t *format, unsigned width, int precision, T value);
+};
+
+// Selects uint32_t if FitsIn32Bits is true, uint64_t otherwise.
+template <bool FitsIn32Bits>
+struct TypeSelector { typedef uint32_t Type; };
+
+template <>
+struct TypeSelector<false> { typedef uint64_t Type; };
+
+// Checks if a number is negative - used to avoid warnings.
+template <bool IsSigned>
+struct SignChecker {
+  template <typename T>
+  static bool is_negative(T) { return false; }
+};
+
+template <>
+struct SignChecker<true> {
+  template <typename T>
+  static bool is_negative(T value) { return value < 0; }
+};
+
+// Returns true if value is negative, false otherwise.
+// Same as (value < 0) but doesn't produce warnings if T is an unsigned type.
+template <typename T>
+inline bool is_negative(T value) {
+  return SignChecker<std::numeric_limits<T>::is_signed>::is_negative(value);
+}
+
+template <typename T>
+struct IntTraits {
+  // Smallest of uint32_t and uint64_t that is large enough to represent
+  // all values of T.
+  typedef typename
+    TypeSelector<std::numeric_limits<T>::digits <= 32>::Type MainType;
+};
+
+// MakeUnsigned<T>::Type gives an unsigned type corresponding to integer type T.
+template <typename T>
+struct MakeUnsigned { typedef T Type; };
+
+#define FMT_SPECIALIZE_MAKE_UNSIGNED(T, U) \
+  template <> \
+  struct MakeUnsigned<T> { typedef U Type; }
+
+FMT_SPECIALIZE_MAKE_UNSIGNED(char, unsigned char);
+FMT_SPECIALIZE_MAKE_UNSIGNED(signed char, unsigned char);
+FMT_SPECIALIZE_MAKE_UNSIGNED(short, unsigned short);
+FMT_SPECIALIZE_MAKE_UNSIGNED(int, unsigned);
+FMT_SPECIALIZE_MAKE_UNSIGNED(long, unsigned long);
+FMT_SPECIALIZE_MAKE_UNSIGNED(LongLong, ULongLong);
+
+void report_unknown_type(char code, const char *type);
+
+extern const uint32_t POWERS_OF_10_32[];
+extern const uint64_t POWERS_OF_10_64[];
+
+#if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll)
+// Returns the number of decimal digits in n. Leading zeros are not counted
+// except for n == 0 in which case count_digits returns 1.
+inline unsigned count_digits(uint64_t n) {
+  // Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10
+  // and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits.
+  unsigned t = (64 - __builtin_clzll(n | 1)) * 1233 >> 12;
+  return t - (n < POWERS_OF_10_64[t]) + 1;
+}
+# if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz)
+// Optional version of count_digits for better performance on 32-bit platforms.
+inline unsigned count_digits(uint32_t n) {
+  uint32_t t = (32 - __builtin_clz(n | 1)) * 1233 >> 12;
+  return t - (n < POWERS_OF_10_32[t]) + 1;
+}
+# endif
+#else
+// Slower version of count_digits used when __builtin_clz is not available.
+inline unsigned count_digits(uint64_t n) {
+  unsigned count = 1;
+  for (;;) {
+    // Integer division is slow so do it for a group of four digits instead
+    // of for every digit. The idea comes from the talk by Alexandrescu
+    // "Three Optimization Tips for C++". See speed-test for a comparison.
+    if (n < 10) return count;
+    if (n < 100) return count + 1;
+    if (n < 1000) return count + 2;
+    if (n < 10000) return count + 3;
+    n /= 10000u;
+    count += 4;
+  }
+}
+#endif
+
+extern const char DIGITS[];
+
+// Formats a decimal unsigned integer value writing into buffer.
+template <typename UInt, typename Char>
+inline void format_decimal(Char *buffer, UInt value, unsigned num_digits) {
+  --num_digits;
+  while (value >= 100) {
+    // Integer division is slow so do it for a group of two digits instead
+    // of for every digit. The idea comes from the talk by Alexandrescu
+    // "Three Optimization Tips for C++". See speed-test for a comparison.
+    unsigned index = (value % 100) * 2;
+    value /= 100;
+    buffer[num_digits] = DIGITS[index + 1];
+    buffer[num_digits - 1] = DIGITS[index];
+    num_digits -= 2;
+  }
+  if (value < 10) {
+    *buffer = static_cast<char>('0' + value);
+    return;
+  }
+  unsigned index = static_cast<unsigned>(value * 2);
+  buffer[1] = DIGITS[index + 1];
+  buffer[0] = DIGITS[index];
+}
+
+#ifdef _WIN32
+// A converter from UTF-8 to UTF-16.
+// It is only provided for Windows since other systems use UTF-8.
+class UTF8ToUTF16 {
+ private:
+  Array<wchar_t, INLINE_BUFFER_SIZE> buffer_;
+
+ public:
+  explicit UTF8ToUTF16(StringRef s);
+  operator WStringRef() const { return WStringRef(&buffer_[0], size()); }
+  size_t size() const { return buffer_.size() - 1; }
+  const wchar_t *c_str() const { return &buffer_[0]; }
+  std::wstring str() const { return std::wstring(&buffer_[0], size()); }
+};
+
+// A converter from UTF-16 to UTF-8.
+// It is only provided for Windows since other systems use UTF-8.
+class UTF16ToUTF8 {
+ private:
+  Array<char, INLINE_BUFFER_SIZE> buffer_;
+
+ public:
+  UTF16ToUTF8() {}
+  explicit UTF16ToUTF8(WStringRef s);
+  operator StringRef() const { return StringRef(&buffer_[0], size()); }
+  size_t size() const { return buffer_.size() - 1; }
+  const char *c_str() const { return &buffer_[0]; }
+  std::string str() const { return std::string(&buffer_[0], size()); }
+
+  // Performs conversion returning a system error code instead of
+  // throwing exception on error.
+  int convert(WStringRef s);
+};
+#endif
+
+// Portable thread-safe version of strerror.
+// Sets buffer to point to a string describing the error code.
+// This can be either a pointer to a string stored in buffer,
+// or a pointer to some static immutable string.
+// Returns one of the following values:
+//   0      - success
+//   ERANGE - buffer is not large enough to store the error message
+//   other  - failure
+// Buffer should be at least of size 1.
+int safe_strerror(int error_code,
+    char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT(true);
+
+void format_system_error(
+    fmt::Writer &out, int error_code, fmt::StringRef message);
+
+#ifdef _WIN32
+void format_windows_error(
+    fmt::Writer &out, int error_code, fmt::StringRef message);
+#endif
+
+// Throws Exception(message) if format contains '}', otherwise throws
+// FormatError reporting unmatched '{'. The idea is that unmatched '{'
+// should override other errors.
+template <typename Char>
+struct FormatErrorReporter {
+  int num_open_braces;
+  void operator()(const Char *s, fmt::StringRef message) const;
+};
+
+// Computes max(Arg, 1) at compile time. It is used to avoid errors about
+// allocating an array of 0 size.
+template <unsigned Arg>
+struct NonZero {
+  enum { VALUE = Arg };
+};
+
+template <>
+struct NonZero<0> {
+  enum { VALUE = 1 };
+};
+
+// A formatting argument. It is a POD type to allow storage in internal::Array.
+struct Arg {
+  enum Type {
+    // Integer types should go first,
+    INT, UINT, LONG_LONG, ULONG_LONG, CHAR, LAST_INTEGER_TYPE = CHAR,
+    // followed by floating-point types.
+    DOUBLE, LONG_DOUBLE, LAST_NUMERIC_TYPE = LONG_DOUBLE,
+    STRING, WSTRING, POINTER, CUSTOM
+  };
+  Type type;
+
+  template <typename Char>
+  struct StringValue {
+    const Char *value;
+    std::size_t size;
+  };
+
+  typedef void (*FormatFunc)(
+      void *formatter, const void *arg, const void *format_str);
+
+  struct CustomValue {
+    const void *value;
+    FormatFunc format;
+  };
+
+  union {
+    int int_value;
+    unsigned uint_value;
+    LongLong long_long_value;
+    ULongLong ulong_long_value;
+    double double_value;
+    long double long_double_value;
+    const void *pointer_value;
+    StringValue<char> string;
+    StringValue<wchar_t> wstring;
+    CustomValue custom;
+  };
+};
+
+// Makes an Arg object from any type.
+template <typename Char>
+class MakeArg : public Arg {
+ private:
+  // The following two methods are private to disallow formatting of
+  // arbitrary pointers. If you want to output a pointer cast it to
+  // "void *" or "const void *". In particular, this forbids formatting
+  // of "[const] volatile char *" which is printed as bool by iostreams.
+  // Do not implement!
+  template <typename T>
+  MakeArg(const T *value);
+  template <typename T>
+  MakeArg(T *value);
+
+  void set_string(StringRef str) {
+    type = STRING;
+    string.value = str.c_str();
+    string.size = str.size();
+  }
+
+  void set_string(WStringRef str) {
+    type = WSTRING;
+    CharTraits<Char>::convert(wchar_t());
+    wstring.value = str.c_str();
+    wstring.size = str.size();
+  }
+
+  // Formats an argument of a custom type, such as a user-defined class.
+  template <typename T>
+  static void format_custom_arg(
+      void *formatter, const void *arg, const void *format_str) {
+    format(*static_cast<BasicFormatter<Char>*>(formatter),
+        static_cast<const Char*>(format_str), *static_cast<const T*>(arg));
+  }
+
+public:
+  MakeArg() {}
+  MakeArg(bool value) { type = INT; int_value = value; }
+  MakeArg(short value) { type = INT; int_value = value; }
+  MakeArg(unsigned short value) { type = UINT; uint_value = value; }
+  MakeArg(int value) { type = INT; int_value = value; }
+  MakeArg(unsigned value) { type = UINT; uint_value = value; }
+  MakeArg(long value) {
+    // To minimize the number of types we need to deal with, long is
+    // translated either to int or to long long depending on its size.
+    if (sizeof(long) == sizeof(int)) {
+      type = INT;
+      int_value = static_cast<int>(value);
+    } else {
+      type = LONG_LONG;
+      long_long_value = value;
+    }
+  }
+  MakeArg(unsigned long value) {
+    if (sizeof(unsigned long) == sizeof(unsigned)) {
+      type = UINT;
+      uint_value = static_cast<unsigned>(value);
+    } else {
+      type = ULONG_LONG;
+      ulong_long_value = value;
+    }
+  }
+  MakeArg(LongLong value) { type = LONG_LONG; long_long_value = value; }
+  MakeArg(ULongLong value) { type = ULONG_LONG; ulong_long_value = value; }
+  MakeArg(float value) { type = DOUBLE; double_value = value; }
+  MakeArg(double value) { type = DOUBLE; double_value = value; }
+  MakeArg(long double value) { type = LONG_DOUBLE; long_double_value = value; }
+  MakeArg(signed char value) { type = CHAR; int_value = value; }
+  MakeArg(unsigned char value) { type = CHAR; int_value = value; }
+  MakeArg(char value) { type = CHAR; int_value = value; }
+  MakeArg(wchar_t value) {
+    type = CHAR;
+    int_value = internal::CharTraits<Char>::convert(value);
+  }
+
+  MakeArg(char *value) { set_string(value); }
+  MakeArg(const char *value) { set_string(value); }
+  MakeArg(const std::string &value) { set_string(value); }
+  MakeArg(StringRef value) { set_string(value); }
+
+  MakeArg(wchar_t *value) { set_string(value); }
+  MakeArg(const wchar_t *value) { set_string(value); }
+  MakeArg(const std::wstring &value) { set_string(value); }
+  MakeArg(WStringRef value) { set_string(value); }
+
+  MakeArg(void *value) { type = POINTER; pointer_value = value; }
+  MakeArg(const void *value) { type = POINTER; pointer_value = value; }
+
+#if 0
+  // WFG: Removed this because otherwise you can pass a CStr8 or an enum etc
+  // into fmt::sprintf, and it will be interpreted as a CUSTOM type and then
+  // will throw an exception at runtime, which is terrible behaviour.
+  template <typename T>
+  MakeArg(const T &value) {
+    type = CUSTOM;
+    custom.value = &value;
+    custom.format = &format_custom_arg<T>;
+  }
+#endif
+};
+
+#define FMT_DISPATCH(call) static_cast<Impl*>(this)->call
+
+// An argument visitor.
+// To use ArgVisitor define a subclass that implements some or all of the
+// visit methods with the same signatures as the methods in ArgVisitor,
+// for example, visit_int(int).
+// Specify the subclass name as the Impl template parameter. Then calling
+// ArgVisitor::visit for some argument will dispatch to a visit method
+// specific to the argument type. For example, if the argument type is
+// double then visit_double(double) method of a subclass will be called.
+// If the subclass doesn't contain a method with this signature, then
+// a corresponding method of ArgVisitor will be called.
+//
+// Example:
+//  class MyArgVisitor : public ArgVisitor<MyArgVisitor, void> {
+//   public:
+//    void visit_int(int value) { print("{}", value); }
+//    void visit_double(double value) { print("{}", value ); }
+//  };
+//
+// ArgVisitor uses the curiously recurring template pattern:
+// http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
+template <typename Impl, typename Result>
+class ArgVisitor {
+ public:
+  Result visit_unhandled_arg() { return Result(); }
+
+  Result visit_int(int value) {
+    return FMT_DISPATCH(visit_any_int(value));
+  }
+  Result visit_long_long(LongLong value) {
+    return FMT_DISPATCH(visit_any_int(value));
+  }
+  Result visit_uint(unsigned value) {
+    return FMT_DISPATCH(visit_any_int(value));
+  }
+  Result visit_ulong_long(ULongLong value) {
+    return FMT_DISPATCH(visit_any_int(value));
+  }
+  Result visit_char(int value) {
+    return FMT_DISPATCH(visit_any_int(value));
+  }
+  template <typename T>
+  Result visit_any_int(T) {
+    return FMT_DISPATCH(visit_unhandled_arg());
+  }
+
+  Result visit_double(double value) {
+    return FMT_DISPATCH(visit_any_double(value));
+  }
+  Result visit_long_double(long double value) {
+    return FMT_DISPATCH(visit_any_double(value));
+  }
+  template <typename T>
+  Result visit_any_double(T) {
+    return FMT_DISPATCH(visit_unhandled_arg());
+  }
+
+  Result visit_string(Arg::StringValue<char>) {
+    return FMT_DISPATCH(visit_unhandled_arg());
+  }
+  Result visit_wstring(Arg::StringValue<wchar_t>) {
+    return FMT_DISPATCH(visit_unhandled_arg());
+  }
+  Result visit_pointer(const void *) {
+    return FMT_DISPATCH(visit_unhandled_arg());
+  }
+  Result visit_custom(Arg::CustomValue) {
+    return FMT_DISPATCH(visit_unhandled_arg());
+  }
+
+  Result visit(const Arg &arg) {
+    switch (arg.type) {
+    default:
+      assert(false);
+      // Fall through.
+    case Arg::INT:
+      return FMT_DISPATCH(visit_int(arg.int_value));
+    case Arg::UINT:
+      return FMT_DISPATCH(visit_uint(arg.uint_value));
+    case Arg::LONG_LONG:
+      return FMT_DISPATCH(visit_long_long(arg.long_long_value));
+    case Arg::ULONG_LONG:
+      return FMT_DISPATCH(visit_ulong_long(arg.ulong_long_value));
+    case Arg::DOUBLE:
+      return FMT_DISPATCH(visit_double(arg.double_value));
+    case Arg::LONG_DOUBLE:
+      return FMT_DISPATCH(visit_long_double(arg.long_double_value));
+    case Arg::CHAR:
+      return FMT_DISPATCH(visit_char(arg.int_value));
+    case Arg::STRING:
+      return FMT_DISPATCH(visit_string(arg.string));
+    case Arg::WSTRING:
+      return FMT_DISPATCH(visit_wstring(arg.wstring));
+    case Arg::POINTER:
+      return FMT_DISPATCH(visit_pointer(arg.pointer_value));
+    case Arg::CUSTOM:
+      return FMT_DISPATCH(visit_custom(arg.custom));
+    }
+  }
+};
+
+class RuntimeError : public std::runtime_error {
+ protected:
+  RuntimeError() : std::runtime_error("") {}
+};
+
+template <typename Char>
+class ArgFormatter;
+}  // namespace internal
+
+/**
+  An argument list.
+ */
+class ArgList {
+ private:
+  const internal::Arg *args_;
+  std::size_t size_;
+
+ public:
+  ArgList() : size_(0) {}
+  ArgList(const internal::Arg *args, std::size_t size)
+  : args_(args), size_(size) {}
+
+  /**
+    Returns the list size (the number of arguments).
+   */
+  std::size_t size() const { return size_; }
+
+  /**
+    Returns the argument at specified index.
+   */
+  const internal::Arg &operator[](std::size_t index) const {
+    return args_[index];
+  }
+};
+
+struct FormatSpec;
+
+namespace internal {
+
+class FormatterBase {
+protected:
+  ArgList args_;
+  int next_arg_index_;
+  const char *error_;
+
+  FormatterBase() : error_(0) {}
+
+  const Arg &next_arg();
+
+  const Arg &handle_arg_index(unsigned arg_index);
+
+  template <typename Char>
+  void write(BasicWriter<Char> &w, const Char *start, const Char *end) {
+    if (start != end)
+      w << BasicStringRef<Char>(start, end - start);
+  }
+
+  // TODO
+};
+
+// A printf formatter.
+template <typename Char>
+class PrintfFormatter : private FormatterBase {
+ private:
+  void parse_flags(FormatSpec &spec, const Char *&s);
+
+  // Parses argument index, flags and width and returns the parsed
+  // argument index.
+  unsigned parse_header(const Char *&s, FormatSpec &spec);
+
+ public:
+  void format(BasicWriter<Char> &writer,
+    BasicStringRef<Char> format, const ArgList &args);
+};
+}  // namespace internal
+
+// A formatter.
+template <typename Char>
+class BasicFormatter : private internal::FormatterBase {
+private:
+  BasicWriter<Char> &writer_;
+  const Char *start_;
+  internal::FormatErrorReporter<Char> report_error_;
+
+  // Parses argument index and returns an argument with this index.
+  const internal::Arg &parse_arg_index(const Char *&s);
+
+  void check_sign(const Char *&s, const internal::Arg &arg);
+
+public:
+  explicit BasicFormatter(BasicWriter<Char> &w) : writer_(w) {}
+
+  BasicWriter<Char> &writer() { return writer_; }
+
+  void format(BasicStringRef<Char> format_str, const ArgList &args);
+
+  const Char *format(const Char *format_str, const internal::Arg &arg);
+};
+
+enum Alignment {
+  ALIGN_DEFAULT, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_NUMERIC
+};
+
+// Flags.
+enum {
+  SIGN_FLAG = 1, PLUS_FLAG = 2, MINUS_FLAG = 4, HASH_FLAG = 8,
+  CHAR_FLAG = 0x10  // Argument has char type - used in error reporting.
+};
+
+// An empty format specifier.
+struct EmptySpec {};
+
+// A type specifier.
+template <char TYPE>
+struct TypeSpec : EmptySpec {
+  Alignment align() const { return ALIGN_DEFAULT; }
+  unsigned width() const { return 0; }
+  int precision() const { return -1; }
+  bool flag(unsigned) const { return false; }
+  char type() const { return TYPE; }
+  char fill() const { return ' '; }
+};
+
+// A width specifier.
+struct WidthSpec {
+  unsigned width_;
+  // Fill is always wchar_t and cast to char if necessary to avoid having
+  // two specialization of WidthSpec and its subclasses.
+  wchar_t fill_;
+
+  WidthSpec(unsigned width, wchar_t fill) : width_(width), fill_(fill) {}
+
+  unsigned width() const { return width_; }
+  wchar_t fill() const { return fill_; }
+};
+
+// An alignment specifier.
+struct AlignSpec : WidthSpec {
+  Alignment align_;
+
+  AlignSpec(unsigned width, wchar_t fill, Alignment align = ALIGN_DEFAULT)
+  : WidthSpec(width, fill), align_(align) {}
+
+  Alignment align() const { return align_; }
+
+  int precision() const { return -1; }
+};
+
+// An alignment and type specifier.
+template <char TYPE>
+struct AlignTypeSpec : AlignSpec {
+  AlignTypeSpec(unsigned width, wchar_t fill) : AlignSpec(width, fill) {}
+
+  bool flag(unsigned) const { return false; }
+  char type() const { return TYPE; }
+};
+
+// A full format specifier.
+struct FormatSpec : AlignSpec {
+  unsigned flags_;
+  int precision_;
+  char type_;
+
+  FormatSpec(
+    unsigned width = 0, char type = 0, wchar_t fill = ' ')
+  : AlignSpec(width, fill), flags_(0), precision_(-1), type_(type) {}
+
+  bool flag(unsigned f) const { return (flags_ & f) != 0; }
+  int precision() const { return precision_; }
+  char type() const { return type_; }
+};
+
+// An integer format specifier.
+template <typename T, typename SpecT = TypeSpec<0>, typename Char = char>
+class IntFormatSpec : public SpecT {
+ private:
+  T value_;
+
+ public:
+  IntFormatSpec(T value, const SpecT &spec = SpecT())
+  : SpecT(spec), value_(value) {}
+
+  T value() const { return value_; }
+};
+
+// A string format specifier.
+template <typename T>
+class StrFormatSpec : public AlignSpec {
+ private:
+  const T *str_;
+
+ public:
+  StrFormatSpec(const T *str, unsigned width, wchar_t fill)
+  : AlignSpec(width, fill), str_(str) {}
+
+  const T *str() const { return str_; }
+};
+
+/**
+  Returns an integer format specifier to format the value in base 2.
+ */
+IntFormatSpec<int, TypeSpec<'b'> > bin(int value);
+
+/**
+  Returns an integer format specifier to format the value in base 8.
+ */
+IntFormatSpec<int, TypeSpec<'o'> > oct(int value);
+
+/**
+  Returns an integer format specifier to format the value in base 16 using
+  lower-case letters for the digits above 9.
+ */
+IntFormatSpec<int, TypeSpec<'x'> > hex(int value);
+
+/**
+  Returns an integer formatter format specifier to format in base 16 using
+  upper-case letters for the digits above 9.
+ */
+IntFormatSpec<int, TypeSpec<'X'> > hexu(int value);
+
+/**
+  \rst
+  Returns an integer format specifier to pad the formatted argument with the
+  fill character to the specified width using the default (right) numeric
+  alignment.
+
+  **Example**::
+
+    Writer out;
+    out << pad(hex(0xcafe), 8, '0');
+    // out.str() == "0000cafe"
+
+  \endrst
+ */
+template <char TYPE_CODE, typename Char>
+IntFormatSpec<int, AlignTypeSpec<TYPE_CODE>, Char> pad(
+    int value, unsigned width, Char fill = ' ');
+
+#define FMT_DEFINE_INT_FORMATTERS(TYPE) \
+inline IntFormatSpec<TYPE, TypeSpec<'b'> > bin(TYPE value) { \
+  return IntFormatSpec<TYPE, TypeSpec<'b'> >(value, TypeSpec<'b'>()); \
+} \
+ \
+inline IntFormatSpec<TYPE, TypeSpec<'o'> > oct(TYPE value) { \
+  return IntFormatSpec<TYPE, TypeSpec<'o'> >(value, TypeSpec<'o'>()); \
+} \
+ \
+inline IntFormatSpec<TYPE, TypeSpec<'x'> > hex(TYPE value) { \
+  return IntFormatSpec<TYPE, TypeSpec<'x'> >(value, TypeSpec<'x'>()); \
+} \
+ \
+inline IntFormatSpec<TYPE, TypeSpec<'X'> > hexu(TYPE value) { \
+  return IntFormatSpec<TYPE, TypeSpec<'X'> >(value, TypeSpec<'X'>()); \
+} \
+ \
+template <char TYPE_CODE> \
+inline IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE> > pad( \
+    IntFormatSpec<TYPE, TypeSpec<TYPE_CODE> > f, unsigned width) { \
+  return IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE> >( \
+      f.value(), AlignTypeSpec<TYPE_CODE>(width, ' ')); \
+} \
+ \
+/* For compatibility with older compilers we provide two overloads for pad, */ \
+/* one that takes a fill character and one that doesn't. In the future this */ \
+/* can be replaced with one overload making the template argument Char      */ \
+/* default to char (C++11). */ \
+template <char TYPE_CODE, typename Char> \
+inline IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE>, Char> pad( \
+    IntFormatSpec<TYPE, TypeSpec<TYPE_CODE>, Char> f, \
+    unsigned width, Char fill) { \
+  return IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE>, Char>( \
+      f.value(), AlignTypeSpec<TYPE_CODE>(width, fill)); \
+} \
+ \
+inline IntFormatSpec<TYPE, AlignTypeSpec<0> > pad( \
+    TYPE value, unsigned width) { \
+  return IntFormatSpec<TYPE, AlignTypeSpec<0> >( \
+      value, AlignTypeSpec<0>(width, ' ')); \
+} \
+ \
+template <typename Char> \
+inline IntFormatSpec<TYPE, AlignTypeSpec<0>, Char> pad( \
+   TYPE value, unsigned width, Char fill) { \
+ return IntFormatSpec<TYPE, AlignTypeSpec<0>, Char>( \
+     value, AlignTypeSpec<0>(width, fill)); \
+}
+
+FMT_DEFINE_INT_FORMATTERS(int)
+FMT_DEFINE_INT_FORMATTERS(long)
+FMT_DEFINE_INT_FORMATTERS(unsigned)
+FMT_DEFINE_INT_FORMATTERS(unsigned long)
+FMT_DEFINE_INT_FORMATTERS(LongLong)
+FMT_DEFINE_INT_FORMATTERS(ULongLong)
+
+/**
+  \rst
+  Returns a string formatter that pads the formatted argument with the fill
+  character to the specified width using the default (left) string alignment.
+
+  **Example**::
+
+    std::string s = str(Writer() << pad("abc", 8));
+    // s == "abc     "
+
+  \endrst
+ */
+template <typename Char>
+inline StrFormatSpec<Char> pad(
+    const Char *str, unsigned width, Char fill = ' ') {
+  return StrFormatSpec<Char>(str, width, fill);
+}
+
+inline StrFormatSpec<wchar_t> pad(
+    const wchar_t *str, unsigned width, char fill = ' ') {
+  return StrFormatSpec<wchar_t>(str, width, fill);
+}
+
+// Generates a comma-separated list with results of applying f to numbers 0..n-1.
+# define FMT_GEN(n, f) FMT_GEN##n(f)
+# define FMT_GEN1(f)  f(0)
+# define FMT_GEN2(f)  FMT_GEN1(f), f(1)
+# define FMT_GEN3(f)  FMT_GEN2(f), f(2)
+# define FMT_GEN4(f)  FMT_GEN3(f), f(3)
+# define FMT_GEN5(f)  FMT_GEN4(f), f(4)
+# define FMT_GEN6(f)  FMT_GEN5(f), f(5)
+# define FMT_GEN7(f)  FMT_GEN6(f), f(6)
+# define FMT_GEN8(f)  FMT_GEN7(f), f(7)
+# define FMT_GEN9(f)  FMT_GEN8(f), f(8)
+# define FMT_GEN10(f) FMT_GEN9(f), f(9)
+
+# define FMT_MAKE_TEMPLATE_ARG(n) typename T##n
+# define FMT_MAKE_ARG(n) const T##n &v##n
+# define FMT_MAKE_REF_char(n) fmt::internal::MakeArg<char>(v##n)
+# define FMT_MAKE_REF_wchar_t(n) fmt::internal::MakeArg<wchar_t>(v##n)
+
+#if FMT_USE_VARIADIC_TEMPLATES
+// Defines a variadic function returning void.
+# define FMT_VARIADIC_VOID(func, arg_type) \
+  template<typename... Args> \
+  void func(arg_type arg1, const Args & ... args) { \
+    using fmt::internal::Arg; \
+    const Arg arg_array[fmt::internal::NonZero<sizeof...(Args)>::VALUE] = { \
+      fmt::internal::MakeArg<Char>(args)... \
+    }; \
+    func(arg1, ArgList(arg_array, sizeof...(Args))); \
+  }
+
+// Defines a variadic constructor.
+# define FMT_VARIADIC_CTOR(ctor, func, arg0_type, arg1_type) \
+  template<typename... Args> \
+  ctor(arg0_type arg0, arg1_type arg1, const Args & ... args) { \
+    using fmt::internal::Arg; \
+    const Arg arg_array[fmt::internal::NonZero<sizeof...(Args)>::VALUE] = { \
+      fmt::internal::MakeArg<Char>(args)... \
+    }; \
+    func(arg0, arg1, ArgList(arg_array, sizeof...(Args))); \
+  }
+
+#else
+
+# define FMT_MAKE_REF(n) fmt::internal::MakeArg<Char>(v##n)
+// Defines a wrapper for a function taking one argument of type arg_type
+// and n additional arguments of arbitrary types.
+# define FMT_WRAP1(func, arg_type, n) \
+  template <FMT_GEN(n, FMT_MAKE_TEMPLATE_ARG)> \
+  inline void func(arg_type arg1, FMT_GEN(n, FMT_MAKE_ARG)) { \
+    const fmt::internal::Arg args[] = {FMT_GEN(n, FMT_MAKE_REF)}; \
+    func(arg1, fmt::ArgList(args, sizeof(args) / sizeof(*args))); \
+  }
+
+// Emulates a variadic function returning void on a pre-C++11 compiler.
+# define FMT_VARIADIC_VOID(func, arg_type) \
+  FMT_WRAP1(func, arg_type, 1) FMT_WRAP1(func, arg_type, 2) \
+  FMT_WRAP1(func, arg_type, 3) FMT_WRAP1(func, arg_type, 4) \
+  FMT_WRAP1(func, arg_type, 5) FMT_WRAP1(func, arg_type, 6) \
+  FMT_WRAP1(func, arg_type, 7) FMT_WRAP1(func, arg_type, 8) \
+  FMT_WRAP1(func, arg_type, 9) FMT_WRAP1(func, arg_type, 10)
+
+# define FMT_CTOR(ctor, func, arg0_type, arg1_type, n) \
+  template <FMT_GEN(n, FMT_MAKE_TEMPLATE_ARG)> \
+  ctor(arg0_type arg0, arg1_type arg1, FMT_GEN(n, FMT_MAKE_ARG)) { \
+    const fmt::internal::Arg args[] = {FMT_GEN(n, FMT_MAKE_REF)}; \
+    func(arg0, arg1, fmt::ArgList(args, sizeof(args) / sizeof(*args))); \
+  }
+
+// Emulates a variadic constructor on a pre-C++11 compiler.
+# define FMT_VARIADIC_CTOR(ctor, func, arg0_type, arg1_type) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 1) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 2) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 3) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 4) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 5) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 6) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 7) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 8) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 9) \
+  FMT_CTOR(ctor, func, arg0_type, arg1_type, 10)
+#endif
+
+// Generates a comma-separated list with results of applying f to pairs
+// (argument, index).
+#define FMT_FOR_EACH1(f, x0) f(x0, 0)
+#define FMT_FOR_EACH2(f, x0, x1) \
+  FMT_FOR_EACH1(f, x0), f(x1, 1)
+#define FMT_FOR_EACH3(f, x0, x1, x2) \
+  FMT_FOR_EACH2(f, x0 ,x1), f(x2, 2)
+#define FMT_FOR_EACH4(f, x0, x1, x2, x3) \
+  FMT_FOR_EACH3(f, x0, x1, x2), f(x3, 3)
+#define FMT_FOR_EACH5(f, x0, x1, x2, x3, x4) \
+  FMT_FOR_EACH4(f, x0, x1, x2, x3), f(x4, 4)
+#define FMT_FOR_EACH6(f, x0, x1, x2, x3, x4, x5) \
+  FMT_FOR_EACH5(f, x0, x1, x2, x3, x4), f(x5, 5)
+#define FMT_FOR_EACH7(f, x0, x1, x2, x3, x4, x5, x6) \
+  FMT_FOR_EACH6(f, x0, x1, x2, x3, x4, x5), f(x6, 6)
+#define FMT_FOR_EACH8(f, x0, x1, x2, x3, x4, x5, x6, x7) \
+  FMT_FOR_EACH7(f, x0, x1, x2, x3, x4, x5, x6), f(x7, 7)
+#define FMT_FOR_EACH9(f, x0, x1, x2, x3, x4, x5, x6, x7, x8) \
+  FMT_FOR_EACH8(f, x0, x1, x2, x3, x4, x5, x6, x7), f(x8, 8)
+#define FMT_FOR_EACH10(f, x0, x1, x2, x3, x4, x5, x6, x7, x8, x9) \
+  FMT_FOR_EACH9(f, x0, x1, x2, x3, x4, x5, x6, x7, x8), f(x9, 9)
+
+/**
+An error returned by an operating system or a language runtime,
+for example a file opening error.
+*/
+class SystemError : public internal::RuntimeError {
+ private:
+  void init(int error_code, StringRef format_str, const ArgList &args);
+
+ protected:
+  int error_code_;
+
+  typedef char Char;  // For FMT_VARIADIC_CTOR.
+
+  SystemError() {}
+
+ public:
+  /**
+   \rst
+   Constructs a :cpp:class:`fmt::SystemError` object with the description
+   of the form "*<message>*: *<system-message>*", where *<message>* is the
+   formatted message and *<system-message>* is the system message corresponding
+   to the error code.
+   *error_code* is a system error code as given by ``errno``.
+   \endrst
+  */
+  SystemError(int error_code, StringRef message) {
+    init(error_code, message, ArgList());
+  }
+  FMT_VARIADIC_CTOR(SystemError, init, int, StringRef)
+
+  int error_code() const { return error_code_; }
+};
+
+/**
+  \rst
+  This template provides operations for formatting and writing data into
+  a character stream. The output is stored in a memory buffer that grows
+  dynamically.
+
+  You can use one of the following typedefs for common character types:
+
+  +---------+----------------------+
+  | Type    | Definition           |
+  +=========+======================+
+  | Writer  | BasicWriter<char>    |
+  +---------+----------------------+
+  | WWriter | BasicWriter<wchar_t> |
+  +---------+----------------------+
+
+  **Example**::
+
+     Writer out;
+     out << "The answer is " << 42 << "\n";
+     out.write("({:+f}, {:+f})", -3.14, 3.14);
+
+  This will write the following output to the ``out`` object:
+
+  .. code-block:: none
+
+     The answer is 42
+     (-3.140000, +3.140000)
+
+  The output can be converted to an ``std::string`` with ``out.str()`` or
+  accessed as a C string with ``out.c_str()``.
+  \endrst
+ */
+template <typename Char>
+class BasicWriter {
+ private:
+  // Output buffer.
+  mutable internal::Array<Char, internal::INLINE_BUFFER_SIZE> buffer_;
+
+  typedef typename internal::CharTraits<Char>::CharPtr CharPtr;
+
+#if defined(_SECURE_SCL) && _SECURE_SCL
+  // Returns pointer value.
+  static Char *get(CharPtr p) { return p.base(); }
+#else
+  static Char *get(Char *p) { return p; }
+#endif
+
+  static CharPtr fill_padding(CharPtr buffer,
+      unsigned total_size, std::size_t content_size, wchar_t fill);
+
+  // Grows the buffer by n characters and returns a pointer to the newly
+  // allocated area.
+  CharPtr grow_buffer(std::size_t n) {
+    std::size_t size = buffer_.size();
+    buffer_.resize(size + n);
+    return internal::make_ptr(&buffer_[size], n);
+  }
+
+  // Prepare a buffer for integer formatting.
+  CharPtr prepare_int_buffer(unsigned num_digits,
+      const EmptySpec &, const char *prefix, unsigned prefix_size) {
+    unsigned size = prefix_size + num_digits;
+    CharPtr p = grow_buffer(size);
+    std::copy(prefix, prefix + prefix_size, p);
+    return p + size - 1;
+  }
+
+  template <typename Spec>
+  CharPtr prepare_int_buffer(unsigned num_digits,
+    const Spec &spec, const char *prefix, unsigned prefix_size);
+
+  // Formats an integer.
+  template <typename T, typename Spec>
+  void write_int(T value, const Spec &spec);
+
+  // Formats a floating-point number (double or long double).
+  template <typename T>
+  void write_double(T value, const FormatSpec &spec);
+
+  // Writes a formatted string.
+  template <typename StrChar>
+  CharPtr write_str(
+      const StrChar *s, std::size_t size, const AlignSpec &spec);
+
+  template <typename StrChar>
+  void write_str(
+      const internal::Arg::StringValue<StrChar> &str, const FormatSpec &spec);
+
+  // This method is private to disallow writing a wide string to a
+  // char stream and vice versa. If you want to print a wide string
+  // as a pointer as std::ostream does, cast it to const void*.
+  // Do not implement!
+  void operator<<(typename internal::CharTraits<Char>::UnsupportedStrType);
+
+  friend class internal::ArgFormatter<Char>;
+  friend class internal::PrintfFormatter<Char>;
+
+ public:
+  /**
+    Constructs a ``BasicWriter`` object.
+   */
+  BasicWriter() {}
+
+#if FMT_USE_RVALUE_REFERENCES
+  /**
+    Constructs a ``BasicWriter`` object moving the content of the other
+    object to it.
+   */
+  BasicWriter(BasicWriter &&other) : buffer_(std::move(other.buffer_)) {}
+
+  /**
+    Moves the content of the other ``BasicWriter`` object to this one.
+   */
+  BasicWriter& operator=(BasicWriter &&other) {
+    assert(this != &other);
+    buffer_ = std::move(other.buffer_);
+    return *this;
+  }
+#endif
+
+  /**
+    Returns the total number of characters written.
+   */
+  std::size_t size() const { return buffer_.size(); }
+
+  /**
+    Returns a pointer to the output buffer content. No terminating null
+    character is appended.
+   */
+  const Char *data() const { return &buffer_[0]; }
+
+  /**
+    Returns a pointer to the output buffer content with terminating null
+    character appended.
+   */
+  const Char *c_str() const {
+    std::size_t size = buffer_.size();
+    buffer_.reserve(size + 1);
+    buffer_[size] = '\0';
+    return &buffer_[0];
+  }
+
+  /**
+    Returns the content of the output buffer as an `std::string`.
+   */
+  std::basic_string<Char> str() const {
+    return std::basic_string<Char>(&buffer_[0], buffer_.size());
+  }
+
+  /**
+    \rst
+    Writes formatted data.
+    
+    *args* is an argument list representing arbitrary arguments.
+
+    **Example**::
+
+       Writer out;
+       out.write("Current point:\n");
+       out.write("({:+f}, {:+f})", -3.14, 3.14);
+
+    This will write the following output to the ``out`` object:
+
+    .. code-block:: none
+
+       Current point:
+       (-3.140000, +3.140000)
+
+    The output can be accessed using :meth:`data`, :meth:`c_str` or :meth:`str`
+    methods.
+
+    See also `Format String Syntax`_.
+    \endrst
+   */
+  void write(BasicStringRef<Char> format, const ArgList &args) {
+    BasicFormatter<Char>(*this).format(format, args);
+  }
+  FMT_VARIADIC_VOID(write, fmt::BasicStringRef<Char>)
+
+  BasicWriter &operator<<(int value) {
+    return *this << IntFormatSpec<int>(value);
+  }
+  BasicWriter &operator<<(unsigned value) {
+    return *this << IntFormatSpec<unsigned>(value);
+  }
+  BasicWriter &operator<<(long value) {
+    return *this << IntFormatSpec<long>(value);
+  }
+  BasicWriter &operator<<(unsigned long value) {
+    return *this << IntFormatSpec<unsigned long>(value);
+  }
+  BasicWriter &operator<<(LongLong value) {
+    return *this << IntFormatSpec<LongLong>(value);
+  }
+
+  /**
+    Formats *value* and writes it to the stream.
+   */
+  BasicWriter &operator<<(ULongLong value) {
+    return *this << IntFormatSpec<ULongLong>(value);
+  }
+
+  BasicWriter &operator<<(double value) {
+    write_double(value, FormatSpec());
+    return *this;
+  }
+
+  /**
+    Formats *value* using the general format for floating-point numbers
+    (``'g'``) and writes it to the stream.
+   */
+  BasicWriter &operator<<(long double value) {
+    write_double(value, FormatSpec());
+    return *this;
+  }
+
+  /**
+    Writes a character to the stream.
+   */
+  BasicWriter &operator<<(char value) {
+    buffer_.push_back(value);
+    return *this;
+  }
+
+  BasicWriter &operator<<(wchar_t value) {
+    buffer_.push_back(internal::CharTraits<Char>::convert(value));
+    return *this;
+  }
+
+  /**
+    Writes *value* to the stream.
+   */
+  BasicWriter &operator<<(fmt::BasicStringRef<Char> value) {
+    const Char *str = value.c_str();
+    buffer_.append(str, str + value.size());
+    return *this;
+  }
+
+  template <typename T, typename Spec, typename FillChar>
+  BasicWriter &operator<<(const IntFormatSpec<T, Spec, FillChar> &spec) {
+    internal::CharTraits<Char>::convert(FillChar());
+    write_int(spec.value(), spec);
+    return *this;
+  }
+
+  template <typename StrChar>
+  BasicWriter &operator<<(const StrFormatSpec<StrChar> &spec) {
+    const StrChar *s = spec.str();
+    // TODO: error if fill is not convertible to Char
+    write_str(s, std::char_traits<Char>::length(s), spec);
+    return *this;
+  }
+
+  void clear() { buffer_.clear(); }
+};
+
+template <typename Char>
+template <typename StrChar>
+typename BasicWriter<Char>::CharPtr BasicWriter<Char>::write_str(
+    const StrChar *s, std::size_t size, const AlignSpec &spec) {
+  CharPtr out = CharPtr();
+  if (spec.width() > size) {
+    out = grow_buffer(spec.width());
+    Char fill = static_cast<Char>(spec.fill());
+    if (spec.align() == ALIGN_RIGHT) {
+      std::fill_n(out, spec.width() - size, fill);
+      out += spec.width() - size;
+    } else if (spec.align() == ALIGN_CENTER) {
+      out = fill_padding(out, spec.width(), size, fill);
+    } else {
+      std::fill_n(out + size, spec.width() - size, fill);
+    }
+  } else {
+    out = grow_buffer(size);
+  }
+  std::copy(s, s + size, out);
+  return out;
+}
+
+template <typename Char>
+template <typename Spec>
+typename fmt::BasicWriter<Char>::CharPtr
+  fmt::BasicWriter<Char>::prepare_int_buffer(
+    unsigned num_digits, const Spec &spec,
+    const char *prefix, unsigned prefix_size) {
+  unsigned width = spec.width();
+  Alignment align = spec.align();
+  Char fill = static_cast<Char>(spec.fill());
+  if (spec.precision() > static_cast<int>(num_digits)) {
+    // Octal prefix '0' is counted as a digit, so ignore it if precision
+    // is specified.
+    if (prefix_size > 0 && prefix[prefix_size - 1] == '0')
+      --prefix_size;
+    unsigned number_size = prefix_size + spec.precision();
+    AlignSpec subspec(number_size, '0', ALIGN_NUMERIC);
+    if (number_size >= width)
+      return prepare_int_buffer(num_digits, subspec, prefix, prefix_size);
+    buffer_.reserve(width);
+    unsigned fill_size = width - number_size;
+    if (align != ALIGN_LEFT) {
+      CharPtr p = grow_buffer(fill_size);
+      std::fill(p, p + fill_size, fill);
+    }
+    CharPtr result = prepare_int_buffer(
+        num_digits, subspec, prefix, prefix_size);
+    if (align == ALIGN_LEFT) {
+      CharPtr p = grow_buffer(fill_size);
+      std::fill(p, p + fill_size, fill);
+    }
+    return result;
+  }
+  unsigned size = prefix_size + num_digits;
+  if (width <= size) {
+    CharPtr p = grow_buffer(size);
+    std::copy(prefix, prefix + prefix_size, p);
+    return p + size - 1;
+  }
+  CharPtr p = grow_buffer(width);
+  CharPtr end = p + width;
+  if (align == ALIGN_LEFT) {
+    std::copy(prefix, prefix + prefix_size, p);
+    p += size;
+    std::fill(p, end, fill);
+  } else if (align == ALIGN_CENTER) {
+    p = fill_padding(p, width, size, fill);
+    std::copy(prefix, prefix + prefix_size, p);
+    p += size;
+  } else {
+    if (align == ALIGN_NUMERIC) {
+      if (prefix_size != 0) {
+        p = std::copy(prefix, prefix + prefix_size, p);
+        size -= prefix_size;
+      }
+    } else {
+      std::copy(prefix, prefix + prefix_size, end - size);
+    }
+    std::fill(p, end - size, fill);
+    p = end;
+  }
+  return p - 1;
+}
+
+template <typename Char>
+template <typename T, typename Spec>
+void BasicWriter<Char>::write_int(T value, const Spec &spec) {
+  unsigned prefix_size = 0;
+  typedef typename internal::IntTraits<T>::MainType UnsignedType;
+  UnsignedType abs_value = value;
+  char prefix[4] = "";
+  if (internal::is_negative(value)) {
+    prefix[0] = '-';
+    ++prefix_size;
+    abs_value = 0 - abs_value;
+  } else if (spec.flag(SIGN_FLAG)) {
+    prefix[0] = spec.flag(PLUS_FLAG) ? '+' : ' ';
+    ++prefix_size;
+  }
+  switch (spec.type()) {
+  case 0: case 'd': {
+    unsigned num_digits = internal::count_digits(abs_value);
+    CharPtr p = prepare_int_buffer(
+      num_digits, spec, prefix, prefix_size) + 1 - num_digits;
+    internal::format_decimal(get(p), abs_value, num_digits);
+    break;
+  }
+  case 'x': case 'X': {
+    UnsignedType n = abs_value;
+    if (spec.flag(HASH_FLAG)) {
+      prefix[prefix_size++] = '0';
+      prefix[prefix_size++] = spec.type();
+    }
+    unsigned num_digits = 0;
+    do {
+      ++num_digits;
+    } while ((n >>= 4) != 0);
+    Char *p = get(prepare_int_buffer(
+      num_digits, spec, prefix, prefix_size));
+    n = abs_value;
+    const char *digits = spec.type() == 'x' ?
+        "0123456789abcdef" : "0123456789ABCDEF";
+    do {
+      *p-- = digits[n & 0xf];
+    } while ((n >>= 4) != 0);
+    break;
+  }
+  case 'b': case 'B': {
+    UnsignedType n = abs_value;
+    if (spec.flag(HASH_FLAG)) {
+      prefix[prefix_size++] = '0';
+      prefix[prefix_size++] = spec.type();
+    }
+    unsigned num_digits = 0;
+    do {
+      ++num_digits;
+    } while ((n >>= 1) != 0);
+    Char *p = get(prepare_int_buffer(num_digits, spec, prefix, prefix_size));
+    n = abs_value;
+    do {
+      *p-- = '0' + (n & 1);
+    } while ((n >>= 1) != 0);
+    break;
+  }
+  case 'o': {
+    UnsignedType n = abs_value;
+    if (spec.flag(HASH_FLAG))
+      prefix[prefix_size++] = '0';
+    unsigned num_digits = 0;
+    do {
+      ++num_digits;
+    } while ((n >>= 3) != 0);
+    Char *p = get(prepare_int_buffer(num_digits, spec, prefix, prefix_size));
+    n = abs_value;
+    do {
+      *p-- = '0' + (n & 7);
+    } while ((n >>= 3) != 0);
+    break;
+  }
+  default:
+    internal::report_unknown_type(
+      spec.type(), spec.flag(CHAR_FLAG) ? "char" : "integer");
+    break;
+  }
+}
+
+// Formats a value.
+template <typename Char, typename T>
+void format(BasicFormatter<Char> &f, const Char *format_str, const T &value) {
+  std::basic_ostringstream<Char> os;
+  os << value;
+  f.format(format_str, internal::MakeArg<Char>(os.str()));
+}
+
+// Reports a system error without throwing an exception.
+// Can be used to report errors from destructors.
+void report_system_error(int error_code, StringRef message) FMT_NOEXCEPT(true);
+
+#ifdef _WIN32
+
+/**
+ A Windows error.
+*/
+class WindowsError : public SystemError {
+ private:
+  void init(int error_code, StringRef format_str, const ArgList &args);
+
+ public:
+  /**
+   \rst
+   Constructs a :cpp:class:`fmt::WindowsError` object with the description
+   of the form "*<message>*: *<system-message>*", where *<message>* is the
+   formatted message and *<system-message>* is the system message corresponding
+   to the error code.
+   *error_code* is a Windows error code as given by ``GetLastError``.
+   \endrst
+  */
+  WindowsError(int error_code, StringRef message) {
+    init(error_code, message, ArgList());
+  }
+  FMT_VARIADIC_CTOR(WindowsError, init, int, StringRef)
+};
+
+// Reports a Windows error without throwing an exception.
+// Can be used to report errors from destructors.
+void report_windows_error(int error_code, StringRef message) FMT_NOEXCEPT(true);
+
+#endif
+
+enum Color { BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE };
+
+/**
+  Formats a string and prints it to stdout using ANSI escape sequences
+  to specify color (experimental).
+  Example:
+    PrintColored(fmt::RED, "Elapsed time: {0:.2f} seconds") << 1.23;
+ */
+void print_colored(Color c, StringRef format, const ArgList &args);
+
+/**
+  \rst
+  Formats arguments and returns the result as a string.
+
+  **Example**::
+
+    std::string message = format("The answer is {}", 42);
+  \endrst
+*/
+inline std::string format(StringRef format_str, const ArgList &args) {
+  Writer w;
+  w.write(format_str, args);
+  return w.str();
+}
+
+inline std::wstring format(WStringRef format_str, const ArgList &args) {
+  WWriter w;
+  w.write(format_str, args);
+  return w.str();
+}
+
+/**
+  \rst
+  Prints formatted data to the file *f*.
+
+  **Example**::
+
+    print(stderr, "Don't {}!", "panic");
+  \endrst
+ */
+void print(std::FILE *f, StringRef format_str, const ArgList &args);
+
+/**
+  \rst
+  Prints formatted data to ``stdout``.
+
+  **Example**::
+
+    print("Elapsed time: {0:.2f} seconds", 1.23);
+  \endrst
+ */
+inline void print(StringRef format_str, const ArgList &args) {
+  print(stdout, format_str, args);
+}
+
+/**
+  \rst
+  Prints formatted data to the stream *os*.
+
+  **Example**::
+
+    print(cerr, "Don't {}!", "panic");
+  \endrst
+ */
+void print(std::ostream &os, StringRef format_str, const ArgList &args);
+
+template <typename Char>
+void printf(BasicWriter<Char> &w,
+    BasicStringRef<Char> format, const ArgList &args) {
+  internal::PrintfFormatter<Char>().format(w, format, args);
+}
+
+/**
+  \rst
+  Formats arguments and returns the result as a string.
+
+  **Example**::
+
+    std::string message = fmt::sprintf("The answer is %d", 42);
+  \endrst
+*/
+inline std::string sprintf(StringRef format, const ArgList &args) {
+  Writer w;
+  printf(w, format, args);
+  return w.str();
+}
+
+/**
+  \rst
+  Prints formatted data to the file *f*.
+
+  **Example**::
+
+    fmt::fprintf(stderr, "Don't %s!", "panic");
+  \endrst
+ */
+int fprintf(std::FILE *f, StringRef format, const ArgList &args);
+
+/**
+  \rst
+  Prints formatted data to ``stdout``.
+
+  **Example**::
+
+    fmt::printf("Elapsed time: %.2f seconds", 1.23);
+  \endrst
+ */
+inline int printf(StringRef format, const ArgList &args) {
+  return fprintf(stdout, format, args);
+}
+
+/**
+  Fast integer formatter.
+ */
+class FormatInt {
+ private:
+  // Buffer should be large enough to hold all digits (digits10 + 1),
+  // a sign and a null character.
+  enum {BUFFER_SIZE = std::numeric_limits<ULongLong>::digits10 + 3};
+  mutable char buffer_[BUFFER_SIZE];
+  char *str_;
+
+  // Formats value in reverse and returns the number of digits.
+  char *format_decimal(ULongLong value) {
+    char *buffer_end = buffer_ + BUFFER_SIZE - 1;
+    while (value >= 100) {
+      // Integer division is slow so do it for a group of two digits instead
+      // of for every digit. The idea comes from the talk by Alexandrescu
+      // "Three Optimization Tips for C++". See speed-test for a comparison.
+      unsigned index = (value % 100) * 2;
+      value /= 100;
+      *--buffer_end = internal::DIGITS[index + 1];
+      *--buffer_end = internal::DIGITS[index];
+    }
+    if (value < 10) {
+      *--buffer_end = static_cast<char>('0' + value);
+      return buffer_end;
+    }
+    unsigned index = static_cast<unsigned>(value * 2);
+    *--buffer_end = internal::DIGITS[index + 1];
+    *--buffer_end = internal::DIGITS[index];
+    return buffer_end;
+  }
+
+  void FormatSigned(LongLong value) {
+    ULongLong abs_value = static_cast<ULongLong>(value);
+    bool negative = value < 0;
+    if (negative)
+      abs_value = 0 - abs_value;
+    str_ = format_decimal(abs_value);
+    if (negative)
+      *--str_ = '-';
+  }
+
+ public:
+  explicit FormatInt(int value) { FormatSigned(value); }
+  explicit FormatInt(long value) { FormatSigned(value); }
+  explicit FormatInt(LongLong value) { FormatSigned(value); }
+  explicit FormatInt(unsigned value) : str_(format_decimal(value)) {}
+  explicit FormatInt(unsigned long value) : str_(format_decimal(value)) {}
+  explicit FormatInt(ULongLong value) : str_(format_decimal(value)) {}
+
+  /**
+    Returns the number of characters written to the output buffer.
+   */
+  std::size_t size() const { return buffer_ - str_ + BUFFER_SIZE - 1; }
+
+  /**
+    Returns a pointer to the output buffer content. No terminating null
+    character is appended.
+   */
+  const char *data() const { return str_; }
+
+  /**
+    Returns a pointer to the output buffer content with terminating null
+    character appended.
+   */
+  const char *c_str() const {
+    buffer_[BUFFER_SIZE - 1] = '\0';
+    return str_;
+  }
+
+  /**
+    Returns the content of the output buffer as an `std::string`.
+   */
+  std::string str() const { return std::string(str_, size()); }
+};
+
+// Formats a decimal integer value writing into buffer and returns
+// a pointer to the end of the formatted string. This function doesn't
+// write a terminating null character.
+template <typename T>
+inline void format_decimal(char *&buffer, T value) {
+  typename internal::IntTraits<T>::MainType abs_value = value;
+  if (internal::is_negative(value)) {
+    *buffer++ = '-';
+    abs_value = 0 - abs_value;
+  }
+  if (abs_value < 100) {
+    if (abs_value < 10) {
+      *buffer++ = static_cast<char>('0' + abs_value);
+      return;
+    }
+    unsigned index = static_cast<unsigned>(abs_value * 2);
+    *buffer++ = internal::DIGITS[index];
+    *buffer++ = internal::DIGITS[index + 1];
+    return;
+  }
+  unsigned num_digits = internal::count_digits(abs_value);
+  internal::format_decimal(buffer, abs_value, num_digits);
+  buffer += num_digits;
+}
+}
+
+#if FMT_GCC_VERSION
+// Use the system_header pragma to suppress warnings about variadic macros
+// because suppressing -Wvariadic-macros with the diagnostic pragma doesn't
+// work. It is used at the end because we want to suppress as little warnings
+// as possible.
+# pragma GCC system_header
+#endif
+
+// This is used to work around VC++ bugs in handling variadic macros.
+#define FMT_EXPAND(args) args
+
+// Returns the number of arguments.
+// Based on https://groups.google.com/forum/#!topic/comp.std.c/d-6Mj5Lko_s.
+#define FMT_NARG(...) FMT_NARG_(__VA_ARGS__, FMT_RSEQ_N())
+#define FMT_NARG_(...) FMT_EXPAND(FMT_ARG_N(__VA_ARGS__))
+#define FMT_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+#define FMT_RSEQ_N() 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+
+#define FMT_CONCAT(a, b) a##b
+#define FMT_FOR_EACH_(N, f, ...) \
+  FMT_EXPAND(FMT_CONCAT(FMT_FOR_EACH, N)(f, __VA_ARGS__))
+#define FMT_FOR_EACH(f, ...) \
+  FMT_EXPAND(FMT_FOR_EACH_(FMT_NARG(__VA_ARGS__), f, __VA_ARGS__))
+
+#define FMT_ADD_ARG_NAME(type, index) type arg##index
+#define FMT_GET_ARG_NAME(type, index) arg##index
+
+#if FMT_USE_VARIADIC_TEMPLATES
+# define FMT_VARIADIC_(Char, ReturnType, func, call, ...) \
+  template<typename... Args> \
+  ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__), \
+      const Args & ... args) { \
+    using fmt::internal::Arg; \
+    const Arg array[fmt::internal::NonZero<sizeof...(Args)>::VALUE] = { \
+      fmt::internal::MakeArg<Char>(args)... \
+    }; \
+    call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), \
+      fmt::ArgList(array, sizeof...(Args))); \
+  }
+#else
+// Defines a wrapper for a function taking __VA_ARGS__ arguments
+// and n additional arguments of arbitrary types.
+# define FMT_WRAP(Char, ReturnType, func, call, n, ...) \
+  template <FMT_GEN(n, FMT_MAKE_TEMPLATE_ARG)> \
+  inline ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__), \
+      FMT_GEN(n, FMT_MAKE_ARG)) { \
+    const fmt::internal::Arg args[] = {FMT_GEN(n, FMT_MAKE_REF_##Char)}; \
+    call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), \
+      fmt::ArgList(args, sizeof(args) / sizeof(*args))); \
+  }
+
+# define FMT_VARIADIC_(Char, ReturnType, func, call, ...) \
+  inline ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__)) { \
+    call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), fmt::ArgList()); \
+  } \
+  FMT_WRAP(Char, ReturnType, func, call, 1, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 2, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 3, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 4, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 5, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 6, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 7, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 8, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 9, __VA_ARGS__) \
+  FMT_WRAP(Char, ReturnType, func, call, 10, __VA_ARGS__)
+#endif  // FMT_USE_VARIADIC_TEMPLATES
+
+/**
+  \rst
+  Defines a variadic function with the specified return type, function name
+  and argument types passed as variable arguments to this macro.
+
+  **Example**::
+
+    void print_error(const char *file, int line, const char *format,
+                     const fmt::ArgList &args) {
+      fmt::print("{}: {}: ", file, line);
+      fmt::print(format, args);
+    }
+    FMT_VARIADIC(void, print_error, const char *, int, const char *)
+
+  ``FMT_VARIADIC`` is used for compatibility with legacy C++ compilers that
+  don't implement variadic templates. You don't have to use this macro if
+  you don't need legacy compiler support and can use variadic templates
+  directly::
+
+    template<typename... Args>
+    void print_error(const char *file, int line, const char *format,
+                     const Args & ... args) {
+      fmt::print("{}: {}: ", file, line);
+      fmt::print(format, args...);
+    }
+  \endrst
+ */
+#define FMT_VARIADIC(ReturnType, func, ...) \
+  FMT_VARIADIC_(char, ReturnType, func, return func, __VA_ARGS__)
+
+#define FMT_VARIADIC_W(ReturnType, func, ...) \
+  FMT_VARIADIC_(wchar_t, ReturnType, func, return func, __VA_ARGS__)
+
+namespace fmt {
+FMT_VARIADIC(std::string, format, StringRef)
+FMT_VARIADIC_W(std::wstring, format, WStringRef)
+FMT_VARIADIC(void, print, StringRef)
+FMT_VARIADIC(void, print, std::FILE *, StringRef)
+FMT_VARIADIC(void, print, std::ostream &, StringRef)
+FMT_VARIADIC(void, print_colored, Color, StringRef)
+FMT_VARIADIC(std::string, sprintf, StringRef)
+FMT_VARIADIC(int, printf, StringRef)
+FMT_VARIADIC(int, fprintf, std::FILE *, StringRef)
+}
+
+// Restore warnings.
+#if FMT_GCC_VERSION >= 406
+# pragma GCC diagnostic pop
+#endif
+
+#endif  // FMT_FORMAT_H_

source/tools/atlas/GameInterface/GameLoop.cpp

@@ -178 +178 @@
                     debug_warn(L"Unrecognised message");
                     // CLogger might not be initialised, but this error will be sent
                     // to the debug output window anyway so people can still see it
-                    LOGERROR(L"Unrecognised message (%hs)", name.c_str());
+                    LOGERROR("Unrecognised message (%s)", name.c_str());
                 }
 
                 if (msg->GetType() == IMessage::Query)

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp

@@ -176 +176 @@
     File file;
     if (file.Open(src, O_RDONLY) < 0)
     {
-        LOGERROR(L"Failed to load heightmap.");
+        LOGERROR("Failed to load heightmap.");
         return;
     }
     
@@ -187 +187 @@
     
     if (read(file.Descriptor(), fileData.get(), fileSize) < 0)
     {
-        LOGERROR(L"Failed to read heightmap image.");
+        LOGERROR("Failed to read heightmap image.");
         file.Close();
         return;
     }
@@ -198 +198 @@
     Tex tex;
     if (tex.decode(fileData, fileSize) < 0)
     {
-        LOGERROR(L"Failed to decode heightmap.");
+        LOGERROR("Failed to decode heightmap.");
         return;
     }
 
     // Convert to uncompressed BGRA with no mipmaps
     if (tex.transform_to((tex.m_Flags | TEX_BGR | TEX_ALPHA) & ~(TEX_DXT | TEX_MIPMAPS)) < 0)
     {
-        LOGERROR(L"Failed to transform heightmap.");
+        LOGERROR("Failed to transform heightmap.");
         return;
     }
 

source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp

@@ -930 +930 @@
             entity_id_t ent = sim.AddEntity(oldObjects[i].templateName.FromUTF8(), oldObjects[i].entityID);
             if (ent == INVALID_ENTITY)
             {
-                LOGERROR(L"Failed to load entity template '%hs'", oldObjects[i].templateName.c_str());
+                LOGERROR("Failed to load entity template '%s'", oldObjects[i].templateName.c_str());
             }
             else
             {