From 294090325a5a5b82344166b807d91e23e644ebc0 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Mon, 3 Nov 2014 15:56:16 +0900 Subject: [PATCH] Plugins: Fix Unicode build --HG-- branch : stable --- .../DisplayBinaryFiles/DisplayBinaryFiles.vcxproj | 42 ++++++++++++----- .../DisplayXMLFiles/DisplayXMLFiles.vcxproj | 46 ++++++++++++------ .../src_VCPP/DisplayXMLFiles/WinMergeScript.cpp | 6 +-- .../EditBinaryFiles/EditBinaryFiles.vcxproj | 42 ++++++++++++----- Plugins/src_VCPP/EditBinaryFiles/Unpacker.cpp | 18 ++++---- .../HideFirstLetter/HideFirstLetter.vcxproj | 42 ++++++++++++----- .../src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj | 42 ++++++++++++----- Plugins/src_VCPP/IgnoreColumns/WinMergeScript.cpp | 4 +- .../IgnoreCommentsC/IgnoreCommentsC.vcxproj | 42 ++++++++++++----- .../src_VCPP/IgnoreCommentsC/WinMergeScript.cpp | 3 -- .../IgnoreFieldsComma/IgnoreFieldsComma.vcxproj | 42 ++++++++++++----- .../src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp | 6 +-- .../IgnoreFieldsTab/IgnoreFieldsTab.vcxproj | 42 ++++++++++++----- .../src_VCPP/IgnoreFieldsTab/WinMergeScript.cpp | 6 +-- .../WatchBeginningOfLog.vcxproj | 42 ++++++++++++----- .../src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj | 54 ++++++++++++++-------- 16 files changed, 328 insertions(+), 151 deletions(-) diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj index 7facceb77..ce0c6f76b 100644 --- a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj +++ b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj @@ -59,50 +59,68 @@ DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\BuildTmp\DisplayBinaryFiles\ReleaseMinSize\ - .\..\..\..\BuildTmp\DisplayBinaryFiles\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(Platform)/$(Configuration)\ - $(Platform)/$(Configuration)\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\DisplayBinaryFiles\ReleaseUMinDependency\ - .\..\..\..\BuildTmp\DisplayBinaryFiles\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\DisplayBinaryFiles\DebugU\ - .\..\..\..\BuildTmp\DisplayBinaryFiles\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\..\..\..\BuildTmp\DisplayBinaryFiles\ReleaseUMinSize\ - .\..\..\..\BuildTmp\DisplayBinaryFiles\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\Debug\ - .\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj index 28d759c70..c85853458 100644 --- a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj +++ b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj @@ -1,4 +1,4 @@ - + @@ -59,50 +59,68 @@ DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\BuildTmp\DisplayXMLFiles\DebugU\ - .\..\..\..\BuildTmp\DisplayXMLFiles\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinDependency\ - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\DisplayXMLFiles\Debug\ - .\..\..\..\BuildTmp\DisplayXMLFiles\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinSize\ - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseUMinDependency\ - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseUMinSize\ - .\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -914,4 +932,4 @@ - + \ No newline at end of file diff --git a/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp b/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp index c65eca35b..0738aec36 100644 --- a/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp +++ b/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp @@ -316,12 +316,12 @@ STDMETHODIMP CWinMergeScript::UnpackFile(BSTR fileSrc, BSTR fileDst, VARIANT_BOO { // There was an error // Give a warning and return without converting anything - char sError[1024]; - sprintf(sError, "%s at line %d\n", + TCHAR sError[1024]; + _stprintf(sError, _T("%s at line %d\n"), XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser)); - ::MessageBox(NULL, sError, "The xml has an error", MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST); + ::MessageBox(NULL, sError, _T("The xml has an error"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST); XML_ParserFree(parser); delete [] buf; fclose(pInput); diff --git a/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj b/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj index fe7827842..a992727fc 100644 --- a/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj +++ b/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj @@ -58,50 +58,68 @@ DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static @@ -157,38 +175,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseUMinSize\ - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\EditBinaryFiles\DebugU\ - .\..\..\..\BuildTmp\EditBinaryFiles\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseMinSize\ - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseUMinDependency\ - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseMinDependency\ - .\..\..\..\BuildTmp\EditBinaryFiles\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\EditBinaryFiles\Debug\ - .\..\..\..\BuildTmp\EditBinaryFiles\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/EditBinaryFiles/Unpacker.cpp b/Plugins/src_VCPP/EditBinaryFiles/Unpacker.cpp index 7d0691b8e..9063c23e0 100644 --- a/Plugins/src_VCPP/EditBinaryFiles/Unpacker.cpp +++ b/Plugins/src_VCPP/EditBinaryFiles/Unpacker.cpp @@ -18,7 +18,7 @@ public: bool Open(LPCTSTR filepath, LPCTSTR mode) { Close(); - m_fp = fopen(filepath, mode); + m_fp = _tfopen(filepath, mode); return (m_fp != 0); } void Close() @@ -104,14 +104,14 @@ bool Packer::Unpack() { USES_CONVERSION; - LPCTSTR szSrcFile = W2T(m_srcFilepath); + LPCTSTR szSrcFile = CW2T(m_srcFilepath); if (!m_in.Open(szSrcFile, _T("rb"))) { LogError(_T("Error opening Unpack src file [%s]"), szSrcFile); return false; } - LPCTSTR szDestFile = W2T(m_destFilepath); + LPCTSTR szDestFile = CW2T(m_destFilepath); if (!m_out.Open(szDestFile, _T("wb"))) { LogError(_T("Error opening Unpack dest file [%s]"), szDestFile); @@ -182,14 +182,14 @@ bool Packer::Pack() { USES_CONVERSION; - LPCTSTR szSrcFile = W2T(m_srcFilepath); + LPCTSTR szSrcFile = CW2T(m_srcFilepath); if (!m_in.Open(szSrcFile, _T("rb"))) { LogError(_T("Error opening Pack src file [%s]"), szSrcFile); return false; } - LPCTSTR szDestFile = W2T(m_destFilepath); + LPCTSTR szDestFile = CW2T(m_destFilepath); if (!m_out.Open(szDestFile, _T("wb"))) { LogError(_T("Error opening Pack dest file [%s]"), szDestFile); @@ -312,7 +312,7 @@ Packer::UnpackChar(unsigned int ch) { WriteChar(m_escape); TCHAR code[5]; - sprintf(code, "%02x", ch); + _stprintf(code, _T("%02x"), ch); for (int j=0; code[j] != 0; ++j) { WriteChar(code[j]); @@ -341,10 +341,10 @@ Packer::LogError(LPCTSTR fmt, ...) { va_list args; va_start(args, fmt); - char buffer[4096]; + TCHAR buffer[4096]; // _vsnprintf into local buffer // so we can see error even tho logging not yet implemented - _vsnprintf(buffer, sizeof(buffer)/sizeof(buffer[0]), fmt, args); + _vsntprintf(buffer, sizeof(buffer)/sizeof(buffer[0]), fmt, args); va_end(args); if (0) @@ -353,7 +353,7 @@ Packer::LogError(LPCTSTR fmt, ...) StdFile logfile; if (logfile.Open(_T("EditBinaryFiles.log"), _T("a"))) { - fprintf(logfile, buffer); + _ftprintf(logfile, buffer); } } } diff --git a/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj b/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj index 3e2977598..f67e9e9d5 100644 --- a/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj +++ b/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj @@ -59,50 +59,68 @@ DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\ReleaseUMinSize\ - .\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinDependency\ - .\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinSize\ - .\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseUMinDependency\ - .\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\DebugU\ - .\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\Debug\ - .\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj b/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj index 4e47986c3..16181583f 100644 --- a/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj +++ b/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj @@ -59,50 +59,68 @@ DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\ReleaseUMinDependency\ - .\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinDependency\ - .\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinSize\ - .\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseUMinSize\ - .\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\Debug\ - .\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\DebugU\ - .\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/IgnoreColumns/WinMergeScript.cpp b/Plugins/src_VCPP/IgnoreColumns/WinMergeScript.cpp index 6207ad87a..47027eea7 100644 --- a/Plugins/src_VCPP/IgnoreColumns/WinMergeScript.cpp +++ b/Plugins/src_VCPP/IgnoreColumns/WinMergeScript.cpp @@ -16,7 +16,7 @@ LPTSTR GetDllFilename(LPTSTR name, int len) name[len] = 0; GetModuleFileName(_Module.GetModuleInstance(), name, len-1); // find last backslash - TCHAR * lastslash = _tcsrchr(name, _T('//')); + TCHAR * lastslash = _tcsrchr(name, '/'); if (lastslash == 0) lastslash = name; else @@ -27,7 +27,7 @@ LPTSTR GetDllFilename(LPTSTR name, int len) else lastslash2 ++; if (lastslash2 != name) - strcpy(name, lastslash2); + lstrcpy(name, lastslash2); return name; } diff --git a/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj b/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj index 21220b665..e8231931b 100644 --- a/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj +++ b/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj @@ -59,50 +59,68 @@ DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\ReleaseUMinDependency\ - .\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinDependency\ - .\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinSize\ - .\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\DebugU\ - .\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\Debug\ - .\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\ReleaseUMinSize\ - .\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp b/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp index 4169b70b5..ac2e4f392 100644 --- a/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp +++ b/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp @@ -70,9 +70,6 @@ STDMETHODIMP CWinMergeScript::PrediffBufferW(BSTR *pText, INT *pSize, VARIANT_BO // find // in lines // compact // ..EOL to //EOL // compact /*.. */ to /**/ (keep line ends) -#ifdef _DEBUG - __asm { int 3 }; -#endif LPWSTR p; p=*pText; diff --git a/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj b/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj index 3656addfc..92fe73a69 100644 --- a/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj +++ b/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj @@ -58,50 +58,68 @@ DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static @@ -157,38 +175,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\ReleaseUMinDependency\ - .\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseUMinSize\ - .\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinSize\ - .\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\DebugU\ - .\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\ReleaseMinDependency\ - .\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\Debug\ - .\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp b/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp index f1b6a68a7..80b908ee8 100644 --- a/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp +++ b/Plugins/src_VCPP/IgnoreFieldsComma/WinMergeScript.cpp @@ -16,18 +16,18 @@ LPTSTR GetDllFilename(LPTSTR name, int len) name[len] = 0; GetModuleFileName(_Module.GetModuleInstance(), name, len-1); // find last backslash - TCHAR * lastslash = _tcsrchr(name, _T('//')); + TCHAR * lastslash = _tcsrchr(name, '/'); if (lastslash == 0) lastslash = name; else lastslash ++; - TCHAR * lastslash2 = _tcsrchr(lastslash, _T('\\')); + TCHAR * lastslash2 = _tcsrchr(lastslash, '\\'); if (lastslash2 == 0) lastslash2 = name; else lastslash2 ++; if (lastslash2 != name) - strcpy(name, lastslash2); + lstrcpy(name, lastslash2); return name; } diff --git a/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj b/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj index 7e70e9ba9..05c5690bc 100644 --- a/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj +++ b/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj @@ -59,50 +59,68 @@ DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ - .\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\ReleaseUMinDependency\ - .\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseMinSize\ - .\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\ReleaseUMinSize\ - .\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\DebugU\ - .\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\ReleaseMinDependency\ - .\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/IgnoreFieldsTab/WinMergeScript.cpp b/Plugins/src_VCPP/IgnoreFieldsTab/WinMergeScript.cpp index 5be162735..750c179d1 100644 --- a/Plugins/src_VCPP/IgnoreFieldsTab/WinMergeScript.cpp +++ b/Plugins/src_VCPP/IgnoreFieldsTab/WinMergeScript.cpp @@ -16,18 +16,18 @@ LPTSTR GetDllFilename(LPTSTR name, int len) name[len] = 0; GetModuleFileName(_Module.GetModuleInstance(), name, len-1); // find last backslash - TCHAR * lastslash = _tcsrchr(name, _T('//')); + TCHAR * lastslash = _tcsrchr(name, '/'); if (lastslash == 0) lastslash = name; else lastslash ++; - TCHAR * lastslash2 = _tcsrchr(lastslash, _T('\\')); + TCHAR * lastslash2 = _tcsrchr(lastslash, '\\'); if (lastslash2 == 0) lastslash2 = name; else lastslash2 ++; if (lastslash2 != name) - strcpy(name, lastslash2); + lstrcpy(name, lastslash2); return name; } diff --git a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj index dbb1b718f..d78c377c2 100644 --- a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj +++ b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj @@ -59,50 +59,68 @@ DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinSize\ - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\WatchBeginningOfLog\Debug\ - .\..\..\..\BuildTmp\WatchBeginningOfLog\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\..\..\..\BuildTmp\WatchBeginningOfLog\DebugU\ - .\..\..\..\BuildTmp\WatchBeginningOfLog\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinDependency\ - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinDependency\ - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinSize\ - .\..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj index 1bb1ee171..de5156bf3 100644 --- a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj +++ b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj @@ -59,50 +59,68 @@ DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static + Unicode DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Unicode + Static DynamicLibrary false + Static DynamicLibrary false + Static DynamicLibrary false + Static @@ -158,38 +176,38 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinDependency\ - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\WatchEndOfLog\Debug\ - .\..\..\..\BuildTmp\WatchEndOfLog\Debug\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinSize\ - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinSize\ - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinSize\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinDependency\ - .\..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinDependency\ + $(Configuration)\ + $(Configuration)\ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - .\..\..\..\BuildTmp\WatchEndOfLog\DebugU\ - .\..\..\..\BuildTmp\WatchEndOfLog\DebugU\ + $(Configuration)\ + $(Configuration)\ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -220,7 +238,7 @@ 0x040c - ..\..\..\Build\MergeRelease\MergePlugins/WatchEndOfLog.dll + $(OutDir)$(ProjectName).dll true .\WatchEndOfLog.def $(TargetDir)$(TargetName).pdb @@ -303,7 +321,7 @@ 0x040c - ..\..\..\Build\MergeDebug\MergePlugins/WatchEndOfLog.dll + $(OutDir)$(ProjectName).dll true .\WatchEndOfLog.def true @@ -388,7 +406,7 @@ 0x040c - ..\..\..\Build\MergeReleaseMinSize/WatchEndOfLog.dll + $(OutDir)$(ProjectName).dll true .\WatchEndOfLog.def $(TargetDir)$(TargetName).pdb @@ -471,7 +489,7 @@ 0x040c - ..\..\..\Build\MergeUnicodeReleaseMinSize/WatchEndOfLog.dll + $(OutDir)$(ProjectName).dll true .\WatchEndOfLog.def $(TargetDir)$(TargetName).pdb @@ -554,7 +572,7 @@ 0x040c - ..\..\..\Build\MergeUnicodeRelease\MergePlugins/WatchEndOfLog.dll + $(OutDir)$(ProjectName).dll true .\WatchEndOfLog.def $(TargetDir)$(TargetName).pdb @@ -637,7 +655,7 @@ 0x040c - ..\..\..\Build\MergeUnicodeDebug\MergePlugins/WatchEndOfLog.dll + $(OutDir)$(ProjectName).dll true .\WatchEndOfLog.def true -- 2.11.0