Merge pull request #1 from oneiric/vs2019

Support VS 2019 16.4

.gitignore

@@ -20,3 +20,4 @@ src/bin/vld.ini
 /src/tests/vld_ComTest/ComTest_i.c
 *.VC.opendb
 *.VC.db
+.vs

README.md

@@ -1,4 +1,4 @@
-# Visual Leak Detector [![Build status](https://ci.appveyor.com/api/projects/status/0kvft8un16e80toj/branch/master?svg=true)](https://ci.appveyor.com/project/KindDragon/vld/branch/master) <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=N3QTYHP9LH6UY&amp;lc=GB&amp;item_name=Visual%20Leak%20Detector&amp;currency_code=USD&amp;bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted" target="_blank"><img src="https://img.shields.io/badge/paypal-donate-yellow.svg" alt="PayPal donate button" /></a>
+# Visual Leak Detector 
 
 ## Introduction
 
@@ -12,20 +12,12 @@ Visual C++ provides built-in memory leak detection, but its capabilities are min
 
 Other after-market leak detectors for Visual C++ are already available. But most of the really popular ones, like Purify and BoundsChecker, are very expensive. A few free alternatives exist, but they're often too intrusive, restrictive, or unreliable. Visual Leak Detector is currently the only freely available memory leak detector for Visual C++ that provides all of the above professional-level features packaged neatly in an easy-to-use library.
 
-Visual Leak Detector is [licensed][3] free of charge as a service to the Windows developer community. If you find it to be useful and would like to just say "Thanks!", or you think it stinks and would like to say "This thing sucks!", please feel free to [drop us a note][1]. Or, if you'd prefer, you can [contribute a small donation][2]. Both are very appreciated.
-
-## Documentation
-
-Read the documentation at [https://github.com/KindDragon/vld/wiki](https://github.com/KindDragon/vld/wiki)
-
 ## Contributing
 
 We encourage developers who've added their own features, or fixed bugs they've found, to contribute to the project. The full version-controlled source tree is available publicly via Git at the URL below. Feel free to clone from this URL and submit patches for consideration for inclusion in future versions. You can also issue pull requests for changes that you've made and would like to share.
 
-* [Source code](https://github.com/KindDragon/vld)
+* [Source code](https://github.com/oneiric/vld)
 
-Copyright © 2005-2017 VLD Team
+Copyright © 2005-2020 VLD Team
 
- [1]: https://github.com/KindDragon/vld/wiki
- [2]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N3QTYHP9LH6UY&lc=GB&item_name=Visual%20Leak%20Detector&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted
- [3]: https://github.com/KindDragon/vld/blob/master/COPYING.txt
+ [1]: https://github.com/oneiric/vld/blob/master/COPYING.txt

lib/cppformat/format.vcxproj

@@ -30,7 +30,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

lib/gtest/include/gtest/gtest.h

@@ -51,6 +51,8 @@
 #ifndef GTEST_INCLUDE_GTEST_GTEST_H_
 #define GTEST_INCLUDE_GTEST_GTEST_H_
 
+#define _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+
 #include <limits>
 #include <ostream>
 #include <vector>

lib/gtest/msvc/gtest.vcxproj

@@ -44,7 +44,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

setup/build_version.bat

@@ -13,7 +13,7 @@ GOTO :GoodPaths
 
 :BadPaths
 ECHO: "Not all build dependencies found. To build VLD you need:"
-ECHO: "* Visual Studio 2015 installed"
+ECHO: "* Visual Studio 2019 installed"
 PAUSE
 GOTO :EndGood
 
@@ -36,13 +36,13 @@ FOR /f "tokens=1-4 delims=:.," %%T IN ("%TIME%") DO (
 	SET /a Start100S=%%T*360000+1%%U*6000+1%%V*100+1%%W - 610100
 )
 
-devenv /nologo vld_vs14.sln %BUILDTYPE% "Release|Win32" /Project vld
+devenv /nologo vld_vs16.sln %BUILDTYPE% "Release|Win32" /Project vld
 IF %ERRORLEVEL% NEQ 0 GOTO EndBad
-devenv /nologo vld_vs14.sln %BUILDTYPE% "Release|x64" /Project vld
+devenv /nologo vld_vs16.sln %BUILDTYPE% "Release|x64" /Project vld
 IF %ERRORLEVEL% NEQ 0 GOTO EndBad
 
-if not exist "%ProgFiles%\Inno Setup 5\ISCC.exe" GOTO EndBad
-"%ProgFiles%\Inno Setup 5\ISCC.exe" setup\vld-setup.iss
+if not exist "%ProgramFiles(x86)%\Inno Setup 6\ISCC.exe" GOTO EndBad
+"%ProgramFiles(x86)%\Inno Setup 6\ISCC.exe" setup\vld-setup.iss
 IF %ERRORLEVEL% NEQ 0 GOTO EndBad
 CD setup
 

setup/version.h

@@ -1,9 +1,9 @@
 
-#define VLDVERSION          L"2.5.1"
-#define VERSION_NUMBER		2,5,1,0
-#define VERSION_STRING		"2.5.1.0"
-#define VERSION_COPYRIGHT	"Copyright (C) 2005-2017"
+#define VLDVERSION          L"2.6.0"
+#define VERSION_NUMBER		2,6,0,0
+#define VERSION_STRING		"2.6.0.0"
+#define VERSION_COPYRIGHT	"Copyright (C) 2005-2020"
 
 #ifndef __FILE__
-!define VLD_VERSION "2.5.1"	// NSIS Script
+!define VLD_VERSION "2.6.0"	// NSIS Script
 #endif

setup/vld-setup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Visual Leak Detector"
-#define MyAppVersion "2.5.1"
+#define MyAppVersion "2.6.0"
 #define MyAppPublisher "VLD Team"
 #define MyAppURL "http://vld.codeplex.com/"
 #define MyAppRegKey "Software\Visual Leak Detector"
@@ -25,7 +25,7 @@ LicenseFile=license-free.txt
 OutputBaseFilename=vld-{#MyAppVersion}-setup
 Compression=lzma
 SolidCompression=True
-MinVersion=0,5.01
+MinVersion=0,6.0
 ; Tell Windows Explorer to reload the environment
 ChangesEnvironment=yes
 AllowNoIcons=yes
@@ -45,12 +45,12 @@ Source: "dbghelp\x64\dbghelp.dll"; DestDir: "{app}\bin\Win64"; Flags: ignorevers
 Source: "dbghelp\x64\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
 Source: "dbghelp\x86\dbghelp.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
 Source: "dbghelp\x86\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "..\src\bin\Win32\Release-v140\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion
-Source: "..\src\bin\Win32\Release-v140\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "..\src\bin\Win32\Release-v140\vld_x86.pdb"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "..\src\bin\x64\Release-v140\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion
-Source: "..\src\bin\x64\Release-v140\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
-Source: "..\src\bin\x64\Release-v140\vld_x64.pdb"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
+Source: "..\src\bin\Win32\Release-v142\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion
+Source: "..\src\bin\Win32\Release-v142\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
+Source: "..\src\bin\Win32\Release-v142\vld_x86.pdb"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
+Source: "..\src\bin\x64\Release-v142\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion
+Source: "..\src\bin\x64\Release-v142\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
+Source: "..\src\bin\x64\Release-v142\vld_x64.pdb"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
 Source: "..\src\vld.h"; DestDir: "{app}\include"; Flags: ignoreversion
 Source: "..\src\vld_def.h"; DestDir: "{app}\include"; Flags: ignoreversion
 Source: "..\vld.ini"; DestDir: "{app}"; Flags: ignoreversion
@@ -61,7 +61,7 @@ Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion
 [Tasks]
 Name: "modifypath"; Description: "Add VLD directory to your environmental path"
 Name: "modifyVS2008Props"; Description: "Add VLD directory to VS 2008"
-Name: "modifyVS2010Props"; Description: "Add VLD directory to VS 2010 - VS 2015"
+Name: "modifyVS2010Props"; Description: "Add VLD directory to VS 2010 - VS 2019"
 
 [ThirdParty]
 UseRelativePaths=True

src/tests/basics/Allocs.cpp

@@ -33,6 +33,8 @@
 #define CRTDLLNAME   _T("msvcr120d.dll")
 #elif _MSC_VER == 1900	// VS 2015
 #define CRTDLLNAME   _T("ucrtbased.dll")
+#elif _MSC_VER == 1924	// VS 2019
+#define CRTDLLNAME   _T("ucrtbased.dll")
 #else
 #error Unsupported compiler
 #endif
@@ -57,6 +59,8 @@
 #define CRTDLLNAME   _T("msvcr120.dll")
 #elif _MSC_VER == 1900	// VS 2015
 #define CRTDLLNAME   _T("ucrtbase.dll")
+#elif _MSC_VER == 1924	// VS 2019
+#define CRTDLLNAME   _T("ucrtbase.dll")
 #else
 #error Unsupported compiler
 #endif

src/tests/basics/basics.vcxproj

@@ -61,7 +61,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/tests/corruption/corruption.vcxproj

@@ -61,7 +61,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/tests/dynamic_app/dynamic_app.vcxproj

@@ -61,7 +61,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/tests/dynamic_dll/dynamic.vcxproj

@@ -61,7 +61,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/tests/mfc/vldmfc.vcxproj

@@ -45,7 +45,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseOfMfc>Dynamic</UseOfMfc>

src/tests/mfc_dll/mfc.vcxproj

@@ -61,7 +61,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/tests/suite/testsuite.cpp

@@ -71,6 +71,8 @@ enum action_e {
 #define CRTDLLNAME   _T("msvcr120d.dll")
 #elif _MSC_VER == 1900	// VS 2015
 #define CRTDLLNAME   _T("ucrtbased.dll")
+#elif _MSC_VER == 1924	// VS 2019
+#define CRTDLLNAME   _T("ucrtbased.dll")
 #else
 #error Unsupported compiler
 #endif
@@ -95,6 +97,8 @@ enum action_e {
 #define CRTDLLNAME   _T("msvcr120.dll")
 #elif _MSC_VER == 1900	// VS 2015
 #define CRTDLLNAME   _T("ucrtbase.dll")
+#elif _MSC_VER == 1924	// VS 2019
+#define CRTDLLNAME   _T("ucrtbase.dll")
 #else
 #error Unsupported compiler
 #endif

src/tests/suite/testsuite.vcxproj

@@ -60,7 +60,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/tests/vld_ComTest/ComTest_vs14.vcxproj

@@ -55,12 +55,13 @@
     <Keyword>AtlProj</Keyword>
     <ProjectName>ComTest</ProjectName>
     <RootNamespace>ComTest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/tests/vld_dll1/vld_dll1_vs14.vcxproj

@@ -55,11 +55,12 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>vld_dll1</RootNamespace>
     <ProjectName>vld_dll1</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

src/tests/vld_dll2/vld_dll2_vs14.vcxproj

@@ -55,11 +55,12 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>vld_dll2</RootNamespace>
     <ProjectName>vld_dll2</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

src/tests/vld_main/vld_main_vs14.vcxproj

@@ -55,11 +55,12 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>vld_main</RootNamespace>
     <ProjectName>vld_main</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

src/tests/vld_main_test/vld_main_test_vs14.vcxproj

@@ -55,11 +55,12 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>vld_main_test</RootNamespace>
     <ProjectName>vld_main_test</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

src/tests/vld_unload/vld_unload_vs14.vcxproj

@@ -55,11 +55,12 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>vld_unload</RootNamespace>
     <ProjectName>vld_unload</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

src/vld.cpp

@@ -972,9 +972,9 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath ()
         delete [] env;
     }
 
-#if _MSC_VER > 1900
-#error Not supported VS
-#endif
+//#if _MSC_VER > 1900
+//#error Not supported VS
+//#endif
     // Append Visual Studio 2015/2013/2012/2010/2008 symbols cache directory.
     for (UINT n = 9; n <= 14; ++n) {
         WCHAR debuggerpath[MAX_PATH] = { 0 };

src/vld.vcxproj

@@ -32,7 +32,7 @@
   <!-- Import Default Property Sheets -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <!-- Global properties -->

vld_vs14.sln → vld_vs16.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}"
 EndProject
@@ -495,4 +495,7 @@ Global
 		{3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}
 		{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {29D39AF8-EB3E-4298-9D8D-4FC4441D9404}
+	EndGlobalSection
 EndGlobal