Ticket #3011: 0010-Automatically-convert-most-path.string-.c_str-to-pat.patch

source/graphics/ColladaManager.cpp

@@ -42 +42 @@
         VfsPath* path = static_cast<VfsPath*>(cb_data);
 
         if (severity == LOG_INFO)
-            LOGMESSAGE("%ls: %hs", path->string().c_str(), text);
+            LOGMESSAGE("%ls: %hs", path->string8(), text);
         else if (severity == LOG_WARNING)
-            LOGWARNING("%ls: %hs", path->string().c_str(), text);
+            LOGWARNING("%ls: %hs", path->string8(), text);
         else
-            LOGERROR("%ls: %hs", path->string().c_str(), text);
+            LOGERROR("%ls: %hs", path->string8(), text);
     }
 
     void ColladaOutput(void* cb_data, const char* data, unsigned int length)
@@ -99 +99 @@
         if (!dll.IsLoaded() && !TryLoadDLL())
             return ERR::FAIL;   
 
-        LOGMESSAGE("Hotloading skeleton definitions from '%ls'", path.string().c_str());
+        LOGMESSAGE("Hotloading skeleton definitions from '%ls'", 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("Failed to read skeleton defintions from '%ls'", path.string().c_str());
+            LOGERROR("Failed to read skeleton defintions from '%ls'", path.string8());
             return ERR::FAIL;
         }
 
         int ok = set_skeleton_definitions((const char*)skeletonFile.GetBuffer(), (int)skeletonFile.GetBufferSize());
         if (ok < 0)
         {
-            LOGERROR("Failed to load skeleton definitions from '%ls'", path.string().c_str());
+            LOGERROR("Failed to load skeleton definitions from '%ls'", path.string8());
             return ERR::FAIL;
         }
 
@@ -221 +221 @@
         bool loaded = false;
         for (VfsPaths::const_iterator it = pathnames.begin(); it != pathnames.end(); ++it)
         {
-            LOGMESSAGE("Loading skeleton definitions from '%ls'", it->string().c_str());
+            LOGMESSAGE("Loading skeleton definitions from '%ls'", 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("Failed to read skeleton defintions from '%ls'", it->string().c_str());
+                LOGERROR("Failed to read skeleton defintions from '%ls'", it->string8());
                 continue;
             }
 
             int ok = set_skeleton_definitions((const char*)skeletonFile.GetBuffer(), (int)skeletonFile.GetBufferSize());
             if (ok < 0)
             {
-                LOGERROR("Failed to load skeleton definitions from '%ls'", it->string().c_str());
+                LOGERROR("Failed to load skeleton definitions from '%ls'", it->string8());
                 continue;
             }
 
@@ -287 +287 @@
                 //  should never happen, unless there really is a problem
                 if (m_VFS->GetFileInfo(*it, &fileInfo) != INFO::OK)
                 {
-                    LOGERROR("Failed to stat '%ls' for DAE caching", it->string().c_str());
+                    LOGERROR("Failed to stat '%ls' for DAE caching", it->string8());
                 }
                 else
                 {

source/graphics/FontManager.cpp

@@ -59 +59 @@
     const VfsPath fntName(fontName.string() + ".fnt");
     if (g_VFS->LoadFile(path / fntName, buf, size) < 0)
     {
-        LOGERROR("Failed to open font file %ls", (path / fntName).string().c_str());
+        LOGERROR("Failed to open font file %ls", (path / fntName).string8());
         return false;
     }
     std::istringstream FNTStream(std::string((const char*)buf.get(), size));

source/graphics/MapGenerator.cpp

@@ -134 +134 @@
     }
 
     // Load RMS
-    LOGMESSAGE("Loading RMS '%ls'", m_ScriptPath.string().c_str());
+    LOGMESSAGE("Loading RMS '%ls'", m_ScriptPath.string8());
     if (!m_ScriptInterface->LoadGlobalScriptFile(m_ScriptPath))
     {
-        LOGERROR("CMapGeneratorWorker::Run: Failed to load RMS '%ls'", m_ScriptPath.string().c_str());
+        LOGERROR("CMapGeneratorWorker::Run: Failed to load RMS '%ls'", m_ScriptPath.string8());
         return false;
     }
 
@@ -210 +210 @@
             PSRETURN ret = file.Load(g_VFS, *it);
             if (ret != PSRETURN_OK)
             {
-                LOGERROR("CMapGeneratorWorker::GetCivData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+                LOGERROR("CMapGeneratorWorker::GetCivData: Failed to load file '%ls': %hs", path.string8(), GetErrorString(ret));
             }
             else
             {
@@ -222 +222 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR("CMapGeneratorWorker::GetCivData: Error reading directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("CMapGeneratorWorker::GetCivData: Error reading directory '%ls': %ls", path.string8(), StatusDescription(ret, error, ARRAY_SIZE(error)));
     }
 
     return data;
@@ -271 +271 @@
     {
         for (VfsPaths::iterator it = pathnames.begin(); it != pathnames.end(); ++it)
         {
-            LOGMESSAGE("Loading map generator script '%ls'", it->string().c_str());
+            LOGMESSAGE("Loading map generator script '%ls'", it->string8());
 
             if (!m_ScriptInterface->LoadGlobalScriptFile(*it))
             {
-                LOGERROR("CMapGeneratorWorker::LoadScripts: Failed to load script '%ls'", it->string().c_str());
+                LOGERROR("CMapGeneratorWorker::LoadScripts: Failed to load script '%ls'", it->string8());
                 return false;
             }
         }
@@ -284 +284 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR("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 '%ls': %ls", path.string8(), StatusDescription(ret, error, ARRAY_SIZE(error)));
         return false;
     }
 

source/graphics/MapWriter.cpp

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

source/graphics/MeshManager.cpp

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

source/graphics/ObjectBase.cpp

@@ -266 +266 @@
 
             if (currentGroup->size() == 0)
             {
-                LOGERROR("Actor group has zero variants ('%ls')", pathname.string().c_str());
+                LOGERROR("Actor group has zero variants ('%ls')", pathname.string8());
             }
 
             ++currentGroup;

source/graphics/ObjectEntry.cpp

@@ -119 +119 @@
     CModelDefPtr modeldef (objectManager.GetMeshManager().GetMesh(m_ModelName));
     if (!modeldef)
     {
-        LOGERROR("CObjectEntry::BuildVariation(): Model %ls failed to load", m_ModelName.string().c_str());
+        LOGERROR("CObjectEntry::BuildVariation(): Model %ls failed to load", m_ModelName.string8());
         return false;
     }
 
@@ -190 +190 @@
     {
         // start up idling
         if (!model->SetAnimation(GetRandomAnimation("idle")))
-            LOGERROR("Failed to set idle animation in model \"%ls\"", m_ModelName.string().c_str());
+            LOGERROR("Failed to set idle animation in model \"%ls\"", m_ModelName.string8());
     }
 
     // build props - TODO, RC - need to fix up bounds here
@@ -240 +240 @@
                 propmodel->ToCModel()->SetAnimation(oe->GetRandomAnimation("idle"));
         }
         else
-            LOGERROR("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 \"%hs\" in model \"%ls\" for actor \"%ls\"", ppn.c_str(), m_ModelName.string8(), m_Base->m_ShortName.c_str());
     }
 
     // setup flags

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("Failed to compile %hs program '%ls' (line %d):\n%hs", targetName, file.string().c_str(), errLine, errStr);
+            LOGERROR("Failed to compile %hs program '%ls' (line %d):\n%hs", targetName, file.string8(), errLine, errStr);
             return false;
         }
 
@@ -310 +310 @@
             pglGetShaderInfoLog(shader, length, NULL, infolog);
 
             if (ok)
-                LOGMESSAGE("Info when compiling shader '%ls':\n%hs", file.string().c_str(), infolog);
+                LOGMESSAGE("Info when compiling shader '%ls':\n%hs", file.string8(), infolog);
             else
-                LOGERROR("Failed to compile shader '%ls':\n%hs", file.string().c_str(), infolog);
+                LOGERROR("Failed to compile shader '%ls':\n%hs", file.string8(), infolog);
 
             delete[] infolog;
         }
@@ -357 +357 @@
             pglGetProgramInfoLog(m_Program, length, NULL, infolog);
 
             if (ok)
-                LOGMESSAGE("Info when linking program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
+                LOGMESSAGE("Info when linking program '%ls'+'%ls':\n%hs", m_VertexFile.string8(), m_FragmentFile.string8(), infolog);
             else
-                LOGERROR("Failed to link program '%ls'+'%ls':\n%hs", m_VertexFile.string().c_str(), m_FragmentFile.string().c_str(), infolog);
+                LOGERROR("Failed to link program '%ls'+'%ls':\n%hs", m_VertexFile.string8(), m_FragmentFile.string8(), infolog);
             
             delete[] infolog;
         }

source/graphics/SkeletonAnimManager.cpp

@@ -65 +65 @@
 
     if (psaFilename.empty())
     {
-        LOGERROR("Could not load animation '%ls'", pathname.string().c_str());
+        LOGERROR("Could not load animation '%ls'", pathname.string8());
         def = NULL;
     }
     else
@@ -76 +76 @@
         }
         catch (PSERROR_File&)
         {
-            LOGERROR("Could not load animation '%ls'", psaFilename.string().c_str());
+            LOGERROR("Could not load animation '%ls'", psaFilename.string8());
         }
     }
 
     if (def)
-        LOGMESSAGE("CSkeletonAnimManager::GetAnimation(%ls): Loaded successfully", pathname.string().c_str());
+        LOGMESSAGE("CSkeletonAnimManager::GetAnimation(%ls): Loaded successfully", pathname.string8());
     else
-        LOGERROR("CSkeletonAnimManager::GetAnimation(%ls): Failed loading, marked file as bad", pathname.string().c_str());
+        LOGERROR("CSkeletonAnimManager::GetAnimation(%ls): 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/TerrainTextureEntry.cpp

@@ -47 +47 @@
     CXeromyces XeroFile;
     if (XeroFile.Load(g_VFS, path) != PSRETURN_OK)
     {
-        LOGERROR("Terrain xml not found (%hs)", path.string().c_str());
+        LOGERROR("Terrain xml not found (%hs)", path.string8());
         return;
     }
 

source/graphics/TerrainTextureManager.cpp

@@ -141 +141 @@
 
 void CTerrainTextureManager::RecurseDirectory(const CTerrainPropertiesPtr& parentProps, const VfsPath& path)
 {
-    //LOGMESSAGE("CTextureManager::RecurseDirectory(%ls)", path.string().c_str());
+    //LOGMESSAGE("CTextureManager::RecurseDirectory(%ls)", path.string8());
 
     CTerrainPropertiesPtr props;
 
@@ -153 +153 @@
     // No terrains.xml, or read failures -> use parent props (i.e. 
     if (!props)
     {
-        LOGMESSAGE("CTerrainTextureManager::RecurseDirectory(%ls): no terrains.xml (or errors while loading) - using parent properties", path.string().c_str());
+        LOGMESSAGE("CTerrainTextureManager::RecurseDirectory(%ls): no terrains.xml (or errors while loading) - using parent properties", path.string8());
         props = parentProps;
     }
 

source/graphics/TextureConverter.cpp

@@ -120 +120 @@
 
     if (root.GetNodeName() != el_textures)
     {
-        LOGERROR("Invalid texture settings file \"%ls\" (unrecognised root element)", path.string().c_str());
+        LOGERROR("Invalid texture settings file \"%ls\" (unrecognised root element)", path.string8());
         return NULL;
     }
 
@@ -326 +326 @@
     size_t fileSize;
     if (m_VFS->LoadFile(src, file, fileSize) < 0)
     {
-        LOGERROR("Failed to load texture \"%ls\"", src.string().c_str());
+        LOGERROR("Failed to load texture \"%ls\"", src.string8());
         return false;
     }
 
     Tex tex;
     if (tex.decode(file, fileSize) < 0)
     {
-        LOGERROR("Failed to decode texture \"%ls\"", src.string().c_str());
+        LOGERROR("Failed to decode texture \"%ls\"", 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("Failed to transform texture \"%ls\"", src.string().c_str());
+            LOGERROR("Failed to transform texture \"%ls\"", src.string8());
             return false;
         }
     }
@@ -356 +356 @@
         // (plain_transform doesn't know how to construct the alpha channel)
         if (tex.m_Flags & TEX_GREY)
         {
-            LOGERROR("Failed to convert grayscale texture \"%ls\" - only RGB textures are currently supported", src.string().c_str());
+            LOGERROR("Failed to convert grayscale texture \"%ls\" - 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("Failed to transform texture \"%ls\"", src.string().c_str());
+            LOGERROR("Failed to transform texture \"%ls\"", src.string8());
             return false;
         }
     }
@@ -482 +482 @@
     return true;
 
 #else
-    LOGERROR("Failed to convert texture \"%ls\" (NVTT not available)", src.string().c_str());
+    LOGERROR("Failed to convert texture \"%ls\" (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("Texture failed to load; \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("Texture failed to load; \"%ls\"", 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("Texture failed to upload: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+            LOGERROR("Texture failed to upload: \"%ls\"", 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("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: \"%ls\"", texture->m_Properties.m_Path.string8());
             texture->SetHandle(m_ErrorHandle);
             return true;
         }
@@ -345 +345 @@
                 }
                 else
                 {
-                    LOGERROR("Texture failed to convert: \"%ls\"", texture->m_Properties.m_Path.string().c_str());
+                    LOGERROR("Texture failed to convert: \"%ls\"", texture->m_Properties.m_Path.string8());
                     texture->SetHandle(m_ErrorHandle);
                 }
                 texture->m_State = CTexture::LOADED;

source/gui/CGUI.cpp

@@ -969 +969 @@
     }
     catch (PSERROR_GUI& e)
     {
-        LOGERROR("Errors loading GUI file %ls (%u)", Filename.string().c_str(), e.getCode());
+        LOGERROR("Errors loading GUI file %ls (%u)", Filename.string8(), e.getCode());
         return;
     }
 }
@@ -1379 +1379 @@
                     CXeromyces XeroIncluded;
                     if (XeroIncluded.Load(g_VFS, *it) != PSRETURN_OK)
                     {
-                        LOGERROR("GUI: Error reading included XML: '%ls'", (*it).string().c_str());
+                        LOGERROR("GUI: Error reading included XML: '%ls'", (*it).string8());
                         continue;
                     }
 
                     XMBElement node = XeroIncluded.GetRoot();
                     if (node.GetNodeName() != XeroIncluded.GetElementID("object"))
                     {
-                        LOGERROR("GUI: Error reading included XML: '%ls', root element must have be of type 'object'.", (*it).string().c_str());
+                        LOGERROR("GUI: Error reading included XML: '%ls', root element must have be of type 'object'.", (*it).string8());
                         continue;
                     }
                     Xeromyces_ReadObject(node, &XeroIncluded, object, NameSubst, Paths, nesting_depth+1);
@@ -1512 +1512 @@
                 }
                 catch (PSERROR_Scripting& e)
                 {
-                    LOGERROR("GUI: Error executing script %ls: %hs", (*it).string().c_str(), e.what());
+                    LOGERROR("GUI: Error executing script %ls: %hs", (*it).string8(), e.what());
                 }
             }
         }

source/gui/GUIManager.cpp

@@ -264 +264 @@
     {
         if (it->inputs.count(path))
         {
-            LOGMESSAGE("GUI file '%ls' changed - reloading page '%ls'", path.string().c_str(), it->name.c_str());
+            LOGMESSAGE("GUI file '%ls' changed - reloading page '%ls'", path.string8(), it->name.c_str());
             LoadPage(*it);
             // TODO: this can crash if LoadPage runs an init script which modifies the page stack and breaks our iterators
         }

source/gui/scripting/ScriptFunctions.cpp

@@ -676 +676 @@
     g_Game->GetWorld()->GetTerrain()->GetHeightMipmap().DumpToDisk(filename);
     OsPath realPath;
     g_VFS->GetRealPath(filename, realPath);
-    LOGMESSAGERENDER("Terrain mipmap written to '%ls'", realPath.string().c_str());
+    LOGMESSAGERENDER("Terrain mipmap written to '%ls'", realPath.string8());
 }
 
 void EnableTimeWarpRecording(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), unsigned int numTurns)

source/i18n/L10n.cpp

@@ -470 +470 @@
     if (path.string().rfind(dictName) == std::string::npos)
         return INFO::OK;
 
-    LOGMESSAGE("Hotloading translations from '%ls'", path.string().c_str());
+    LOGMESSAGE("Hotloading translations from '%ls'", path.string8());
 
     CVFSFile file;
     if (file.Load(g_VFS, path) != PSRETURN_OK)
     {
-        LOGERROR("Failed to read translations from '%ls'", path.string().c_str());
+        LOGERROR("Failed to read translations from '%ls'", path.string8());
         return ERR::FAIL;
     }
 

source/ps/ConfigDB.cpp

@@ -214 +214 @@
         // Handle missing files quietly
         if (g_VFS->GetFileInfo(m_ConfigFile[ns], NULL) < 0)
         {
-            LOGMESSAGE("Cannot find config file \"%ls\" - ignoring", m_ConfigFile[ns].string().c_str());
+            LOGMESSAGE("Cannot find config file \"%ls\" - ignoring", m_ConfigFile[ns].string8());
             return false;
         }
 
-        LOGMESSAGE("Loading config file \"%ls\"", m_ConfigFile[ns].string().c_str());
+        LOGMESSAGE("Loading config file \"%ls\"", m_ConfigFile[ns].string8());
         Status ret = g_VFS->LoadFile(m_ConfigFile[ns], buffer, buflen);
         if (ret != INFO::OK)
         {
-            LOGERROR("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 \"%ls\" failed: return was %lld", m_ConfigFile[ns].string8(), (long long)ret);
             return false;
         }
     }
@@ -256 +256 @@
 
             if (pos == filebufend || *pos == '\n')
             {
-                LOGERROR("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 '%ls'", line, m_ConfigFile[ns].string8());
                 header.clear();
                 ++line;
                 continue;
@@ -267 +267 @@
             while (++pos < filebufend && *pos != '\n' && *pos != ';')
                 if (*pos != ' ' && *pos != '\r')
                 {
-                    LOGERROR("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 '%ls'", line, m_ConfigFile[ns].string8());
                     break;
                 }
             while (pos < filebufend && *pos != '\n')
@@ -288 +288 @@
                     {
                         if (*pos == '\\' && ++pos == filebufend)
                         {
-                            LOGERROR("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 '%ls')", line, m_ConfigFile[ns].string8());
                             break;
                         }
 
@@ -316 +316 @@
                 }
             }
             if (quoted) // We ignore the invalid parameter
-                LOGERROR("Unmatched quote while parsing config file '%ls' on line %d", m_ConfigFile[ns].string().c_str(), line);
+                LOGERROR("Unmatched quote while parsing config file '%ls' on line %d", m_ConfigFile[ns].string8(), line);
             else if (!value.empty())
                 values.push_back(value);
             value.clear();
@@ -348 +348 @@
             }
         }
         else if (!name.empty())
-            LOGERROR("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 '%hs' without value while parsing '%ls' on line %d", name.c_str(), m_ConfigFile[ns].string8(), line);
 
         name.clear();
         values.clear();
@@ -393 +393 @@
     Status ret = g_VFS->CreateFile(path, buf, len);
     if (ret < 0)
     {
-        LOGERROR("CConfigDB::WriteFile(): CreateFile \"%ls\" failed (error: %d)", path.string().c_str(), (int)ret);
+        LOGERROR("CConfigDB::WriteFile(): CreateFile \"%ls\" failed (error: %d)", path.string8(), (int)ret);
         return false;
     }
 

source/ps/FileIo.cpp

@@ -69 +69 @@
     const Status st = g_VFS->CreateFile(filename, m_writeBuffer.Data(), m_writeBuffer.Size());
     if (st < 0)
     {
-        LOGERROR("Failed to write file '%ls' with status '%lld'", filename.string().c_str(), (long long)st);
+        LOGERROR("Failed to write file '%ls' 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("CVFSFile: file %ls couldn't be opened (vfs_load: %lld)", filename.string().c_str(), (long long)ret);
+            LOGERROR("CVFSFile: file %ls 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/GameSetup.cpp

@@ -1132 +1132 @@
 
     if (INFO::OK != loadResult)
     {
-        LOGERROR("LoadSettingsOfScenarioMap: Unable to load map file '%ls'", mapPath.string().c_str());
+        LOGERROR("LoadSettingsOfScenarioMap: Unable to load map file '%ls'", mapPath.string8());
         throw PSERROR_Game_World_MapLoadFailed("Unable to load map file, check the path for typos.");
     }
     XMBElement mapElement = mapFile.GetRoot();

source/ps/GameSetup/Paths.cpp

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

source/ps/ProfileViewer.cpp

@@ -575 +575 @@
         }
         else
         {
-            LOGMESSAGERENDER("Profiler snapshot saved to '%ls'", path.string().c_str());
+            LOGMESSAGERENDER("Profiler snapshot saved to '%ls'", path.string8());
         }
     }
 

source/ps/SavedGame.cpp

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

source/ps/Util.cpp

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

source/ps/World.cpp

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

source/ps/XML/XMLWriter.cpp

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

source/ps/XML/Xeromyces.cpp

@@ -89 +89 @@
 
         // No source file or archive cache was found, so we can't load the
         // XML file at all
-        LOGERROR("CCacheLoader failed to find archived or source file for: \"%ls\"", filename.string().c_str());
+        LOGERROR("CCacheLoader failed to find archived or source file for: \"%ls\"", filename.string8());
         return PSRETURN_Xeromyces_XMLOpenFailed;
     }
 
@@ -111 +111 @@
     CVFSFile input;
     if (input.Load(vfs, filename))
     {
-        LOGERROR("CXeromyces: Failed to open XML file %ls", filename.string().c_str());
+        LOGERROR("CXeromyces: Failed to open XML file %ls", filename.string8());
         return PSRETURN_Xeromyces_XMLOpenFailed;
     }
 
@@ -120 +120 @@
         filename8.c_str(), NULL, XML_PARSE_NONET|XML_PARSE_NOCDATA);
     if (! doc)
     {
-        LOGERROR("CXeromyces: Failed to parse XML file %ls", filename.string().c_str());
+        LOGERROR("CXeromyces: Failed to parse XML file %ls", filename.string8());
         return PSRETURN_Xeromyces_XMLParseError;
     }
 

source/renderer/ModelRenderer.cpp

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

source/renderer/PostprocManager.cpp

@@ -519 +519 @@
     
     VfsPaths pathnames;
     if(vfs::GetPathnames(g_VFS, path, 0, pathnames) < 0)
-        LOGERROR("Error finding Post effects in '%ls'", path.string().c_str());
+        LOGERROR("Error finding Post effects in '%ls'", path.string8());
 
     for(size_t i = 0; i < pathnames.size(); i++)
     {

source/renderer/SkyManager.cpp

@@ -207 +207 @@
     DirectoryNames subdirectories;
     if(g_VFS->GetDirectoryEntries(path, 0, &subdirectories) < 0)
     {
-        LOGERROR("Error opening directory '%ls'", path.string().c_str());
+        LOGERROR("Error opening directory '%ls'", path.string8());
         return std::vector<CStrW>(1, GetSkySet()); // just return what we currently have
     }
 

source/scriptinterface/ScriptInterface.cpp

@@ -478 +478 @@
     {
         if (!LoadGlobalScriptFile(*it))
         {
-            LOGERROR("LoadGlobalScripts: Failed to load script %ls", it->string().c_str());
+            LOGERROR("LoadGlobalScripts: Failed to load script %ls", it->string8());
             return false;
         }
     }
@@ -866 +866 @@
     JSAutoRequest rq(m->m_cx);
     if (!VfsFileExists(path))
     {
-        LOGERROR("File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%ls' does not exist", path.string8());
         return false;
     }
 
@@ -876 +876 @@
 
     if (ret != PSRETURN_OK)
     {
-        LOGERROR("Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%ls': %hs", path.string8(), GetErrorString(ret));
         return false;
     }
 
@@ -954 +954 @@
 {
     if (!VfsFileExists(path))
     {
-        LOGERROR("File '%ls' does not exist", path.string().c_str());
+        LOGERROR("File '%ls' does not exist", path.string8());
         return;
     }
 
@@ -964 +964 @@
 
     if (ret != PSRETURN_OK)
     {
-        LOGERROR("Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+        LOGERROR("Failed to load file '%ls': %hs", path.string8(), GetErrorString(ret));
         return;
     }
 
     std::string content(file.DecodeUTF8()); // assume it's UTF-8
 
     if (!ParseJSON(content, out))
-        LOGERROR("Failed to parse '%ls'", path.string().c_str());
+        LOGERROR("Failed to parse '%ls'", path.string8());
 }
 
 struct Stringifier

source/simulation2/Simulation2.cpp

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

source/simulation2/components/CCmpAIManager.cpp

@@ -104 +104 @@
             m_Worker.LoadMetadata(path, &metadata);
             if (metadata.isUndefined())
             {
-                LOGERROR("Failed to create AI player: can't find %ls", path.string().c_str());
+                LOGERROR("Failed to create AI player: can't find %ls", path.string8());
                 return false;
             }
 
@@ -116 +116 @@
             JS::RootedValue ctor(cx);
             if (!m_ScriptInterface->HasProperty(metadata, "moduleName"))
             {
-                LOGERROR("Failed to create AI player: %ls: missing 'moduleName'", path.string().c_str());
+                LOGERROR("Failed to create AI player: %ls: missing 'moduleName'", path.string8());
                 return false;
             }
 
@@ -124 +124 @@
             if (!m_ScriptInterface->GetProperty(global, moduleName.c_str(), &objectWithConstructor)
                 || objectWithConstructor.isUndefined())
             {
-                LOGERROR("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: %ls: can't find the module that should contain the constructor: '%hs'", path.string8(), moduleName.c_str());
                 return false;
             }
 
             if (!m_ScriptInterface->GetProperty(metadata, "constructor", constructor))
             {
-                LOGERROR("Failed to create AI player: %ls: missing 'constructor'", path.string().c_str());
+                LOGERROR("Failed to create AI player: %ls: missing 'constructor'", path.string8());
                 return false;
             }
 
@@ -138 +138 @@
             if (!m_ScriptInterface->GetProperty(objectWithConstructor, constructor.c_str(), &ctor)
                 || ctor.isNull())
             {
-                LOGERROR("Failed to create AI player: %ls: can't find constructor '%hs'", path.string().c_str(), constructor.c_str());
+                LOGERROR("Failed to create AI player: %ls: can't find constructor '%hs'", path.string8(), constructor.c_str());
                 return false;
             }
 
@@ -160 +160 @@
 
             if (obj.isNull())
             {
-                LOGERROR("Failed to create AI player: %ls: error calling constructor '%hs'", path.string().c_str(), constructor.c_str());
+                LOGERROR("Failed to create AI player: %ls: error calling constructor '%hs'", path.string8(), constructor.c_str());
                 return false;
             }
 
@@ -269 +269 @@
         {
             if (!m_ScriptInterface->LoadGlobalScriptFile(*it))
             {
-                LOGERROR("Failed to load script %ls", it->string().c_str());
+                LOGERROR("Failed to load script %ls", it->string8());
                 return false;
             }
         }
@@ -391 +391 @@
         JS::RootedValue ctor(cx);
         if (!m_ScriptInterface->GetProperty(global, "API3", &AIModule) || AIModule.isUndefined())
         {
-            LOGERROR("Failed to create shared AI component: %ls: can't find module '%hs'", path.string().c_str(), "API3");
+            LOGERROR("Failed to create shared AI component: %ls: can't find module '%hs'", path.string8(), "API3");
             return false;
         }
         
         if (!m_ScriptInterface->GetProperty(AIModule, "SharedScript", &ctor)
             || ctor.isUndefined())
         {
-            LOGERROR("Failed to create shared AI component: %ls: can't find constructor '%hs'", path.string().c_str(), "SharedScript");
+            LOGERROR("Failed to create shared AI component: %ls: can't find constructor '%hs'", path.string8(), "SharedScript");
             return false;
         }
         
@@ -440 +440 @@
         
         if (tmpSharedAIObj.isNull())
         {
-            LOGERROR("Failed to create shared AI component: %ls: error calling constructor '%hs'", path.string().c_str(), "SharedScript");
+            LOGERROR("Failed to create shared AI component: %ls: error calling constructor '%hs'", path.string8(), "SharedScript");
             return false;
         }
         

source/simulation2/system/ComponentManager.cpp

@@ -1226 +1226 @@
     {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR("Error reading directory '%ls': %ls", cbData.path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR("Error reading directory '%ls': %ls", cbData.path.string8(), StatusDescription(ret, error, ARRAY_SIZE(error)));
     }
     
     return cbData.templates;

source/soundmanager/SoundManager.cpp

@@ -216 +216 @@
 
 Status CSoundManager::ReloadChangedFiles(const VfsPath& UNUSED(path))
 {
-//  LOGERROR("GUI file '%ls' changed - reloading page", path.string().c_str());
+//  LOGERROR("GUI file '%ls' changed - reloading page", path.string8());
 
     return INFO::OK;
 }
@@ -654 +654 @@
         group = new CSoundGroup();
         if (!group->LoadSoundGroup(L"audio/" + groupPath.string()))
         {
-            LOGERROR("Failed to load sound group '%ls'", groupPath.string().c_str());
+            LOGERROR("Failed to load sound group '%ls'", groupPath.string8());
             delete group;
             group = NULL;
         }

source/soundmanager/data/SoundData.cpp

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

source/soundmanager/scripting/SoundGroup.cpp

@@ -197 +197 @@
             itemRollOff = 0;
         
         if ( sndData->IsStereo() )
-            LOGWARNING( "OpenAL: stereo sounds can't be positioned: %ls", sndData->GetFileName()->string().c_str() );
+            LOGWARNING( "OpenAL: stereo sounds can't be positioned: %ls", 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("%ls: pathname=%ls, error=%ls", message.c_str(), pathname.string().c_str(), ErrorString(err));
+    LOGERROR("%ls: pathname=%ls, error=%ls", message.c_str(), pathname.string8(), ErrorString(err));
 }
 
 void CSoundGroup::PlayNext(const CVector3D& position, entity_id_t source)