BUG: [ 2925208 ] Font charset name in config log is incorrect

diff --git a/Src/Common/multiformatText.cpp b/Src/Common/multiformatText.cpp
index 5d81fc2..4a8066a 100644 (file)
--- a/Src/Common/multiformatText.cpp
+++ b/Src/Common/multiformatText.cpp
@@ -113,7 +113,7 @@ void storageForPlugins::ValidateNewFile()
                if (!::DeleteFile(m_tempFilenameDst.c_str()))
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s")
-                               , m_tempFilenameDst.c_str(), GetSysError(GetLastError())));
+                               , m_tempFilenameDst.c_str(), GetSysError(GetLastError()).c_str()));
                }
                // we may reuse the temp filename
                // tempFilenameDst.Empty();
@@ -126,7 +126,7 @@ void storageForPlugins::ValidateNewFile()
                        if (!::DeleteFile(m_filename.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s")
-                                       , m_filename.c_str(), GetSysError(GetLastError())));
+                                       , m_filename.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                        ::MoveFile(m_tempFilenameDst.c_str(), m_filename.c_str());
                }

diff --git a/Src/ConfigLog.cpp b/Src/ConfigLog.cpp
index 7558752..a0f2a3b 100644 (file)
--- a/Src/ConfigLog.cpp
+++ b/Src/ConfigLog.cpp
@@ -522,7 +522,7 @@ bool CConfigLog::DoFile(bool writing, String &sError)
        FileWriteString(_T("\r\n Font:\r\n"));
        FileWriteString(Fmt(_T("  Font facename: %s\r\n"), m_fontSettings.sFacename.c_str()));
        FileWriteString(Fmt(_T("  Font charset: %d (%s)\r\n"), m_fontSettings.nCharset, 
-               FontCharsetName(m_fontSettings.nCharset)));
+               FontCharsetName(m_fontSettings.nCharset).c_str()));
 
 // System settings
        FileWriteString(_T("\r\nSystem settings:\r\n"));

diff --git a/Src/DiffTextBuffer.cpp b/Src/DiffTextBuffer.cpp
index 45e7387..f5ca8b2 100644 (file)
--- a/Src/DiffTextBuffer.cpp
+++ b/Src/DiffTextBuffer.cpp
@@ -515,7 +515,7 @@ LoadFromFileExit:
                if (!::DeleteFile(pszFileName))
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                               pszFileName, GetSysError(GetLastError())));
+                               pszFileName, GetSysError(GetLastError()).c_str()));
                }
 
        return nRetVal;
@@ -579,10 +579,10 @@ int CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                        sError = uniErr.GetError().c_str();
                        if (bTempFile)
                                LogErrorString(Fmt(_T("Opening file %s failed: %s"),
-                                       pszFileName, sError));
+                                       pszFileName, sError.c_str()));
                        else
                                LogErrorString(Fmt(_T("Opening file %s failed: %s"),
-                                       sIntermediateFilename, sError));
+                                       sIntermediateFilename.c_str(), sError.c_str()));
                }
                return SAVE_FAILED;
        }
@@ -648,7 +648,7 @@ int CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                        if (!::DeleteFile(sIntermediateFilename.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       sIntermediateFilename.c_str(), GetSysError(GetLastError())));
+                                       sIntermediateFilename.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                        // returns now, don't overwrite the original file
                        return SAVE_PACK_FAILED;
@@ -659,7 +659,7 @@ int CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                        if (!::DeleteFile(sIntermediateFilename.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       sIntermediateFilename.c_str(), GetSysError(GetLastError())));
+                                       sIntermediateFilename.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                        sIntermediateFilename = csTempFileName;
                }
@@ -670,7 +670,7 @@ int CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                        if (!::DeleteFile(sIntermediateFilename.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       sIntermediateFilename.c_str(), GetSysError(GetLastError())));
+                                       sIntermediateFilename.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                        if (bClearModifiedFlag)
                        {
@@ -689,7 +689,7 @@ int CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                {
                        sError = GetSysError(GetLastError());
                        LogErrorString(Fmt(_T("CopyFile(%s, %s) failed: %s"),
-                               sIntermediateFilename.c_str(), pszFileName, sError));
+                               sIntermediateFilename.c_str(), pszFileName, sError.c_str()));
                }
        }
        else

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 5cf4fa9..3f188b0 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -820,7 +820,7 @@ BOOL CDiffWrapper::RunFileDiff()
                        if (!::DeleteFile(strFile1Temp.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       strFile1Temp.c_str(), GetSysError(GetLastError())));
+                                       strFile1Temp.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                        strFile1Temp.erase();
                }
@@ -829,7 +829,7 @@ BOOL CDiffWrapper::RunFileDiff()
                        if (!::DeleteFile(strFile2Temp.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       strFile2Temp.c_str(), GetSysError(GetLastError())));
+                                       strFile2Temp.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                        strFile2Temp.erase();
                }

diff --git a/Src/DirCmpReport.cpp b/Src/DirCmpReport.cpp
index 4b9c237..5573087 100644 (file)
--- a/Src/DirCmpReport.cpp
+++ b/Src/DirCmpReport.cpp
@@ -364,8 +364,8 @@ void DirCmpReport::GenerateXmlHeader()
 {
        WriteString(_T("")); // @todo xml declaration
        WriteString(_T("<WinMergeDiffReport version=\"1\">\n"));
-       WriteString(Fmt(_T("<left>%s</left>\n"), m_rootPaths.GetLeft()));
-       WriteString(Fmt(_T("<right>%s</right>\n"), m_rootPaths.GetRight()));
+       WriteString(Fmt(_T("<left>%s</left>\n"), m_rootPaths.GetLeft().c_str()));
+       WriteString(Fmt(_T("<right>%s</right>\n"), m_rootPaths.GetRight().c_str()));
        WriteString(Fmt(_T("<time>%s</time>\n"), GetCurrentTimeString().c_str()));
 
        // Add column headers

diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp
index 93a0ab1..5188256 100644 (file)
--- a/Src/FileTransform.cpp
+++ b/Src/FileTransform.cpp
@@ -452,7 +452,7 @@ BOOL FileTransform_NormalizeUnicode(String & filepath, BOOL bMayOverwrite)
                        if (!::DeleteFile(filepath.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       filepath.c_str(), GetSysError(GetLastError())));
+                                       filepath.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                }
                // and change the filepath if everything works
@@ -463,7 +463,7 @@ BOOL FileTransform_NormalizeUnicode(String & filepath, BOOL bMayOverwrite)
                if (!::DeleteFile(tempFilepath.c_str()))
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                               tempFilepath.c_str(), GetSysError(GetLastError())));
+                               tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
                }
        }
 
@@ -498,7 +498,7 @@ BOOL FileTransform_UCS2ToUTF8(String & filepath, BOOL bMayOverwrite)
                        if (!::DeleteFile(filepath.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       filepath.c_str(), GetSysError(GetLastError())));
+                                       filepath.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                }
                // and change the filepath if everything works
@@ -509,7 +509,7 @@ BOOL FileTransform_UCS2ToUTF8(String & filepath, BOOL bMayOverwrite)
                if (!::DeleteFile(tempFilepath.c_str()))
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                               tempFilepath.c_str(), GetSysError(GetLastError())));
+                               tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
                }
        }
 
@@ -641,7 +641,7 @@ BOOL FileTransform_ToUTF8(String & filepath, BOOL bMayOverwrite)
                        if (!::DeleteFile(filepath.c_str()))
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                                       filepath.c_str(), GetSysError(GetLastError())));
+                                       filepath.c_str(), GetSysError(GetLastError()).c_str()));
                        }
                }
                // and change the filepath if everything works
@@ -652,7 +652,7 @@ BOOL FileTransform_ToUTF8(String & filepath, BOOL bMayOverwrite)
                if (!::DeleteFile(tempFilepath.c_str()))
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                               tempFilepath.c_str(), GetSysError(GetLastError())));
+                               tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
                }
        }
        return TRUE;

diff --git a/Src/HexMergeView.cpp b/Src/HexMergeView.cpp
index 72768ff..edd1d45 100644 (file)
--- a/Src/HexMergeView.cpp
+++ b/Src/HexMergeView.cpp
@@ -335,7 +335,7 @@ HRESULT CHexMergeView::SaveFile(LPCTSTR path)
        if (hr != S_OK)
        {
                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
-                       sIntermediateFilename.c_str(), GetSysError(hr)));
+                       sIntermediateFilename.c_str(), GetSysError(hr).c_str()));
        }
        return S_OK;
 }

diff --git a/Src/VSSHelper.cpp b/Src/VSSHelper.cpp
index db90ab3..25cc758 100644 (file)
--- a/Src/VSSHelper.cpp
+++ b/Src/VSSHelper.cpp
@@ -64,14 +64,14 @@ BOOL VSSHelper::ReLinkVCProj(CString strSavePath, CString * psError)
        if (tempPath.empty())
        {
                LogErrorString(Fmt(_T("CMainFrame::ReLinkVCProj() - couldn't get temppath: %s")
-                       , GetSysError(nerr)));
+                       , GetSysError(nerr).c_str()));
                return FALSE;
        }
        String tempFile = env_GetTempFileName(tempPath.c_str(), _T("_LT"), &nerr);
        if (tempFile.empty())
        {
                LogErrorString(Fmt(_T("CMainFrame::ReLinkVCProj() - couldn't get tempfile: %s")
-                       , GetSysError(nerr)));
+                       , GetSysError(nerr).c_str()));
                return FALSE;
        }
 

diff --git a/Src/files.cpp b/Src/files.cpp
index 32bfb5d..cd171d1 100644 (file)
--- a/Src/files.cpp
+++ b/Src/files.cpp
@@ -67,7 +67,7 @@ BOOL files_openFileMapped(MAPPEDFILEDATA *fileData)
        {
                bSuccess = FALSE;
                LogErrorString(Fmt(_T("CreateFile(%s) failed in files_openFileMapped: %s")
-                       , fileData->fileName, GetSysError(GetLastError())));
+                       , fileData->fileName, GetSysError(GetLastError()).c_str()));
        }
        else
        {
@@ -95,7 +95,7 @@ BOOL files_openFileMapped(MAPPEDFILEDATA *fileData)
                {
                        bSuccess = FALSE;
                        LogErrorString(Fmt(_T("CreateFileMapping(%s) failed: %s")
-                               , fileData->fileName, GetSysError(GetLastError())));
+                               , fileData->fileName, GetSysError(GetLastError()).c_str()));
                }
                else
                {
@@ -105,7 +105,7 @@ BOOL files_openFileMapped(MAPPEDFILEDATA *fileData)
                        {
                                bSuccess = FALSE;
                                LogErrorString(Fmt(_T("MapViewOfFile(%s) failed: %s")
-                                       , fileData->fileName, GetSysError(GetLastError())));
+                                       , fileData->fileName, GetSysError(GetLastError()).c_str()));
                        }
                }
        }