diff --git a/Externals/crystaledit/editlib/editlibparsers.vcxitems b/Externals/crystaledit/editlib/editlibparsers.vcxitems index 13657c24fd3..9f02a5415ea 100644 --- a/Externals/crystaledit/editlib/editlibparsers.vcxitems +++ b/Externals/crystaledit/editlib/editlibparsers.vcxitems @@ -194,7 +194,10 @@ pch.h $(IntDir)$(TargetName)2.pch - + + pch.h + $(IntDir)$(TargetName)2.pch + pch.h $(IntDir)$(TargetName)2.pch diff --git a/Externals/crystaledit/editlib/utils/fpattern.cpp b/Externals/crystaledit/editlib/utils/fpattern.cpp index e519d5a7d49..db6e942b84f 100644 --- a/Externals/crystaledit/editlib/utils/fpattern.cpp +++ b/Externals/crystaledit/editlib/utils/fpattern.cpp @@ -14,7 +14,7 @@ // - LEAVE THIS HEADER INTACT //////////////////////////////////////////////////////////////////////////// -#include "StdAfx.h" +#include "pch.h" #include "fpattern.h" #if TEST diff --git a/Src/Common/LanguageSelect.h b/Src/Common/LanguageSelect.h index fad565895e8..9a43f68db72 100644 --- a/Src/Common/LanguageSelect.h +++ b/Src/Common/LanguageSelect.h @@ -8,10 +8,13 @@ #include #include #include +#include "UnicodeString.h" ///////////////////////////////////////////////////////////////////////////// // CLanguageSelect class +class CStatusBar; + /** * @brief Class for selecting GUI language. * diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj index 394db371425..910ecfe8bca 100644 --- a/Src/Merge.vcxproj +++ b/Src/Merge.vcxproj @@ -1417,7 +1417,10 @@ - + + pch.h + $(IntDir)$(TargetName)2.pch + pch.h $(IntDir)$(TargetName)2.pch @@ -1441,6 +1444,7 @@ + @@ -1823,4 +1827,4 @@ - + \ No newline at end of file diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters index dcbdc63c98f..238c553c55f 100644 --- a/Src/Merge.vcxproj.filters +++ b/Src/Merge.vcxproj.filters @@ -1368,6 +1368,9 @@ Header Files + + Common\Header Files + diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp index 3ac676c0a90..0112e1fe37f 100644 --- a/Src/MergeAppCOMClass.cpp +++ b/Src/MergeAppCOMClass.cpp @@ -1,4 +1,5 @@ -#include "StdAfx.h" +#include "pch.h" +#include #include "MergeAppCOMClass.h" #include "LanguageSelect.h" #include "OptionsMgr.h" diff --git a/Testing/FolderCompare/FolderCompare.vcxproj b/Testing/FolderCompare/FolderCompare.vcxproj index 8901e2d0b82..932d24a0393 100644 --- a/Testing/FolderCompare/FolderCompare.vcxproj +++ b/Testing/FolderCompare/FolderCompare.vcxproj @@ -43,7 +43,7 @@ Application - Static + false Unicode 7.0 v141_xp @@ -53,7 +53,7 @@ Application - Static + false Unicode 7.0 v141_xp @@ -63,7 +63,7 @@ Application - Static + false Unicode 10.0.17763.0 v141 @@ -72,7 +72,7 @@ Application - Static + false Unicode 10.0.17763.0 v141 @@ -81,7 +81,7 @@ Application - Static + false Unicode 10.0.17763.0 v141 @@ -90,7 +90,7 @@ Application - Static + false Unicode 10.0.17763.0 v141 @@ -100,7 +100,7 @@ Application - Static + false Unicode 10.0.17763.0 v141 @@ -110,7 +110,7 @@ Application - Static + false Unicode 10.0.17763.0 v141 @@ -179,7 +179,7 @@ /Zc:__cplusplus %(AdditionalOptions) MinSpace OnlyExplicitInline - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;NDEBUG;WIN32;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) true MultiThreaded @@ -226,7 +226,7 @@ /Zc:__cplusplus %(AdditionalOptions) MinSpace OnlyExplicitInline - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) true MultiThreaded @@ -270,7 +270,7 @@ /Zc:__cplusplus %(AdditionalOptions) MinSpace OnlyExplicitInline - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) true MultiThreaded @@ -313,7 +313,7 @@ /Zc:__cplusplus %(AdditionalOptions) MinSpace OnlyExplicitInline - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) true MultiThreaded @@ -355,7 +355,7 @@ /Zc:__cplusplus %(AdditionalOptions) Disabled - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -397,7 +397,7 @@ /Zc:__cplusplus %(AdditionalOptions) Disabled - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -420,7 +420,7 @@ 0x0409 - afxnmcdd.lib;uafxcwd.lib;libcmtd.lib;version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies) + version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies) true ..\..\Externals\poco\lib64;%(AdditionalLibraryDirectories) true @@ -430,14 +430,15 @@ false false 5.02 - afxnmcdd.lib;uafxcwd.lib;libcmtd.lib + + /Zc:__cplusplus %(AdditionalOptions) Disabled - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -476,7 +477,7 @@ /Zc:__cplusplus %(AdditionalOptions) Disabled - ..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) + .;..\..\Src;..\..\Src\CompareEngines;..\..\Src\Common;..\..\Externals\crystaledit\editlib;..\..\Src\diffutils;..\..\Src\diffutils\lib;..\..\Src\diffutils\src;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;%(AdditionalIncludeDirectories) WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -667,7 +668,10 @@ pch.h $(IntDir)$(TargetName)2.pch - + + pch.h + $(IntDir)$(TargetName)2.pch + Use pch.h @@ -789,16 +793,6 @@ $(IntDir)$(TargetName)2.pch $(IntDir)$(TargetName)2.pch - - Create - Create - Create - Create - Create - Create - Create - Create - @@ -855,8 +849,8 @@ + - diff --git a/Testing/FolderCompare/FolderCompare.vcxproj.filters b/Testing/FolderCompare/FolderCompare.vcxproj.filters index cd8f6afaa42..3b1e4bee0fe 100644 --- a/Testing/FolderCompare/FolderCompare.vcxproj.filters +++ b/Testing/FolderCompare/FolderCompare.vcxproj.filters @@ -162,9 +162,6 @@ Source Files - - Source Files - Source Files @@ -332,9 +329,6 @@ Header Files - - Header Files - Header Files @@ -347,5 +341,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/Testing/FolderCompare/StdAfx.cpp b/Testing/FolderCompare/StdAfx.cpp deleted file mode 100644 index fd4f341c7b2..00000000000 --- a/Testing/FolderCompare/StdAfx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/Testing/FolderCompare/StdAfx.h b/Testing/FolderCompare/StdAfx.h deleted file mode 100644 index c98fff5ec5e..00000000000 --- a/Testing/FolderCompare/StdAfx.h +++ /dev/null @@ -1,159 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// -/** - * @file Src/StdAfx.h - * - * @brief Project-wide includes and declarations - */ -#pragma once - -#if defined _M_IX86 -#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") -#elif defined _M_IA64 -#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"") -#elif defined _M_X64 -#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"") -#else -#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") -#endif - -// On Win XP, with VS2008, do not use default WINVER 0x0600 because of -// some windows structure used in API (on VISTA they are longer) -#if !defined(WINVER) -# define WINVER 0x0501 -#endif /* !defined(WINVER) */ - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -// Common MFC headers - -#include // MFC core and standard components -#include // MFC extensions -#include // MFC support for Windows Common Controls - -#include // MFC C++ template collection classes -#include // MFC private declarations (crystal text needs but doesn't include this) -#include // MFC OLE (COM) support - -#include - -// For CSizingControlBar -#include "sizecbar.h" -#include "scbarg.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** - * @name User-defined Windows-messages - */ -/* @{ */ -/// Directory compare thread asks UI (view) update -const UINT MSG_UI_UPDATE = WM_USER + 1; -/// Request to save panesizes -const UINT MSG_STORE_PANESIZES = WM_USER + 2; -/// Request to generate file compare report -const UINT MSG_GENERATE_FLIE_COMPARE_REPORT = WM_USER + 3; -/* @} */ - -/// Seconds ignored in filetime differences if option enabled -static const UINT SmallTimeDiff = 2; - -#include "UnicodeString.h" -#include "MergeApp.h" - - /** @brief Wrapper around CMergeApp::TranslateDialog() */ -void NTAPI LangTranslateDialog(HWND); - - /** @brief Lang aware version of AfxMessageBox() */ -int NTAPI LangMessageBox(UINT, UINT nType = MB_OK, UINT nIDHelp = (UINT)-1); - - /** @brief include for the custom dialog boxes, with do not ask/display again */ -#include "MessageBoxDialog.h" - -#ifdef _MAX_PATH -# undef _MAX_PATH -#endif -#define _MAX_PATH (260 * sizeof(wchar_t) / sizeof(tchar_t)) - -#ifdef MAX_PATH -# undef MAX_PATH -#endif -#define MAX_PATH (260 * sizeof(wchar_t) / sizeof(tchar_t)) - -#ifdef MAX_PATH_FULL -# undef MAX_PATH_FULL -#endif -#define MAX_PATH_FULL (32767 * sizeof(wchar_t) / sizeof(tchar_t)) - -#define WMPROFILE(x) CWinMergeProfile __wmtl__(x) - -class CWinMergeProfile -{ -private: - static int level; - static CMapStringToPtr map; - static LARGE_INTEGER origin; - LARGE_INTEGER li[2]; - LARGE_INTEGER freq; - tchar_t funcname[256]; -public: - explicit CWinMergeProfile(const tchar_t* pFuncName) { - tchar_t buf[256]; - _stprintf_s(buf, _T("%-*s funcname=%s Start\n"), level, L"", pFuncName); - OutputDebugString(buf); - lstrcpy(funcname, pFuncName); - QueryPerformanceFrequency(&freq); - QueryPerformanceCounter(&li[0]); - if (origin.QuadPart == 0) - origin = li[0]; - ++level; - } - ~CWinMergeProfile() { - QueryPerformanceCounter(&li[1]); - tchar_t buf[256]; - level--; - int elapsed = (int)((double)(li[1].QuadPart - li[0].QuadPart) / freq.QuadPart*1000.0*1000.0); - int tim = (int)((double)(li[1].QuadPart - origin.QuadPart) / freq.QuadPart*1000.0*1000.0); - struct stat { - int sum = 0; - int count = 0; - } *pstat; - void *pstatv = nullptr; - if (!map.Lookup(funcname, pstatv)) - { - pstat = new stat(); - map[funcname] = (void *)pstat; - } - else - { - pstat = reinterpret_cast(pstatv); - } - pstat->sum += elapsed; - pstat->count++; - _stprintf_s(buf, _T("%-*s funcname=%s t=%d[us] count=%d sum=%d[us] time=%g[ms]\n"), level, L"", funcname, elapsed, pstat->count, pstat->sum, tim/1000.0); - OutputDebugString(buf); - } - static void ResetTimer() - { - QueryPerformanceCounter(&origin); - } - static void Terminiate() - { - map.RemoveAll(); - } -};